From f016d77eabbdf32e33f9158fae160ea8468dbc2b Mon Sep 17 00:00:00 2001 From: Alex Kogon Date: Thu, 10 Sep 2015 14:52:43 +0200 Subject: [PATCH 01/14] always use text to match xpath --- src/org/synthuse/XpathManager.java | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/org/synthuse/XpathManager.java b/src/org/synthuse/XpathManager.java index c432b4f..9feb8ae 100644 --- a/src/org/synthuse/XpathManager.java +++ b/src/org/synthuse/XpathManager.java @@ -52,7 +52,8 @@ public XpathManager(HWND hwnd, String enumProperties, JTextPane windowsXmlTextPa @Override public void run() { - String results = buildXpathStatement(); + //@TODO (AJK) create separate action to use text mathing + String results = buildXpathStatement(true,50,50); events.executionCompleted(hwnd, results); } @@ -143,7 +144,22 @@ public String buildXpathStatement(boolean useFullTextMatching, int maxParentText parentTxtStr = " and @text='" + parentTxtStr + "'"; } if (!parentClassStr.isEmpty()) - builtXpath = "//win[@class='" + parentClassStr + "'" + parentTxtStr + "]/win[@class='" + classStr + "']"; + { + if (!txtStr.isEmpty()&&useFullTextMatching) { + if (txtStr.length() > maxTextLength) {// if the text is too long only test the first maxTextLength characters + txtStr = WindowsEnumeratedXml.escapeXmlAttributeValue(txtStr.substring(0, maxTextLength)); + txtStr = " and starts-with(@text,'" + txtStr + "')"; + } + else + txtStr = " and @text='" + txtStr + "'"; + builtXpath = "//win[@class='" + parentClassStr + "'" + parentTxtStr + "]/win[@class='" + classStr + "'" + txtStr + "]"; + } + else + { + builtXpath = "//win[@class='" + parentClassStr + "'" + parentTxtStr + "]/win[@class='" + classStr + "']"; + } + } + System.out.println(builtXpath); resultList = WindowsEnumeratedXml.evaluateXpathGetValues(xml, builtXpath); if (resultList.size() > 1) { // if there are still multiple results add position to the xpath int position = 1; From d6bd79d578d2525aea43431aac53adfd5159cf34 Mon Sep 17 00:00:00 2001 From: Alex Kogon Date: Thu, 10 Sep 2015 16:09:16 +0200 Subject: [PATCH 02/14] fixed error caused by editing twice --- src/org/synthuse/XpathManager.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/org/synthuse/XpathManager.java b/src/org/synthuse/XpathManager.java index 9feb8ae..737be8d 100644 --- a/src/org/synthuse/XpathManager.java +++ b/src/org/synthuse/XpathManager.java @@ -146,13 +146,14 @@ public String buildXpathStatement(boolean useFullTextMatching, int maxParentText if (!parentClassStr.isEmpty()) { if (!txtStr.isEmpty()&&useFullTextMatching) { - if (txtStr.length() > maxTextLength) {// if the text is too long only test the first maxTextLength characters - txtStr = WindowsEnumeratedXml.escapeXmlAttributeValue(txtStr.substring(0, maxTextLength)); - txtStr = " and starts-with(@text,'" + txtStr + "')"; + String copyOfTxtStr = txtStr; + if (copyOfTxtStr.length() > maxTextLength) {// if the text is too long only test the first maxTextLength characters + copyOfTxtStr = WindowsEnumeratedXml.escapeXmlAttributeValue(copyOfTxtStr.substring(0, maxTextLength)); + copyOfTxtStr = " and starts-with(@text,'" + copyOfTxtStr + "')"; } else - txtStr = " and @text='" + txtStr + "'"; - builtXpath = "//win[@class='" + parentClassStr + "'" + parentTxtStr + "]/win[@class='" + classStr + "'" + txtStr + "]"; + copyOfTxtStr = " and @text='" + copyOfTxtStr + "'"; + builtXpath = "//win[@class='" + parentClassStr + "'" + parentTxtStr + "]/win[@class='" + classStr + "'" + copyOfTxtStr + "]"; } else { From a2caddae70001a3faa1b80668fcd2767e0553f73 Mon Sep 17 00:00:00 2001 From: Alex Kogon Date: Fri, 11 Sep 2015 10:49:27 +0200 Subject: [PATCH 03/14] addMoreInfoOnVMToAntBuildLogging --- build.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build.xml b/build.xml index 154b8ee..94e82ae 100644 --- a/build.xml +++ b/build.xml @@ -21,6 +21,9 @@ basedir: ${basedir} VM: ${java.vm.name} + VM Version: ${java.vm.specification.version} + VM Vendor: ${java.vm.vendor} + VM Build: ${java.vm.version} Username: ${user.name} From 17a964fc19a4142a625b73a660acadbb52024994 Mon Sep 17 00:00:00 2001 From: Alex Kogon Date: Thu, 10 Sep 2015 14:52:43 +0200 Subject: [PATCH 04/14] always use text to match xpath --- src/org/synthuse/XpathManager.java | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/org/synthuse/XpathManager.java b/src/org/synthuse/XpathManager.java index c432b4f..9feb8ae 100644 --- a/src/org/synthuse/XpathManager.java +++ b/src/org/synthuse/XpathManager.java @@ -52,7 +52,8 @@ public XpathManager(HWND hwnd, String enumProperties, JTextPane windowsXmlTextPa @Override public void run() { - String results = buildXpathStatement(); + //@TODO (AJK) create separate action to use text mathing + String results = buildXpathStatement(true,50,50); events.executionCompleted(hwnd, results); } @@ -143,7 +144,22 @@ public String buildXpathStatement(boolean useFullTextMatching, int maxParentText parentTxtStr = " and @text='" + parentTxtStr + "'"; } if (!parentClassStr.isEmpty()) - builtXpath = "//win[@class='" + parentClassStr + "'" + parentTxtStr + "]/win[@class='" + classStr + "']"; + { + if (!txtStr.isEmpty()&&useFullTextMatching) { + if (txtStr.length() > maxTextLength) {// if the text is too long only test the first maxTextLength characters + txtStr = WindowsEnumeratedXml.escapeXmlAttributeValue(txtStr.substring(0, maxTextLength)); + txtStr = " and starts-with(@text,'" + txtStr + "')"; + } + else + txtStr = " and @text='" + txtStr + "'"; + builtXpath = "//win[@class='" + parentClassStr + "'" + parentTxtStr + "]/win[@class='" + classStr + "'" + txtStr + "]"; + } + else + { + builtXpath = "//win[@class='" + parentClassStr + "'" + parentTxtStr + "]/win[@class='" + classStr + "']"; + } + } + System.out.println(builtXpath); resultList = WindowsEnumeratedXml.evaluateXpathGetValues(xml, builtXpath); if (resultList.size() > 1) { // if there are still multiple results add position to the xpath int position = 1; From acc70c67c6ddc7e60e0ce6a0235e0ddcaafd9178 Mon Sep 17 00:00:00 2001 From: Alex Kogon Date: Thu, 10 Sep 2015 16:09:16 +0200 Subject: [PATCH 05/14] fixed error caused by editing twice --- src/org/synthuse/XpathManager.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/org/synthuse/XpathManager.java b/src/org/synthuse/XpathManager.java index 9feb8ae..737be8d 100644 --- a/src/org/synthuse/XpathManager.java +++ b/src/org/synthuse/XpathManager.java @@ -146,13 +146,14 @@ public String buildXpathStatement(boolean useFullTextMatching, int maxParentText if (!parentClassStr.isEmpty()) { if (!txtStr.isEmpty()&&useFullTextMatching) { - if (txtStr.length() > maxTextLength) {// if the text is too long only test the first maxTextLength characters - txtStr = WindowsEnumeratedXml.escapeXmlAttributeValue(txtStr.substring(0, maxTextLength)); - txtStr = " and starts-with(@text,'" + txtStr + "')"; + String copyOfTxtStr = txtStr; + if (copyOfTxtStr.length() > maxTextLength) {// if the text is too long only test the first maxTextLength characters + copyOfTxtStr = WindowsEnumeratedXml.escapeXmlAttributeValue(copyOfTxtStr.substring(0, maxTextLength)); + copyOfTxtStr = " and starts-with(@text,'" + copyOfTxtStr + "')"; } else - txtStr = " and @text='" + txtStr + "'"; - builtXpath = "//win[@class='" + parentClassStr + "'" + parentTxtStr + "]/win[@class='" + classStr + "'" + txtStr + "]"; + copyOfTxtStr = " and @text='" + copyOfTxtStr + "'"; + builtXpath = "//win[@class='" + parentClassStr + "'" + parentTxtStr + "]/win[@class='" + classStr + "'" + copyOfTxtStr + "]"; } else { From b97109c3ec6c35c74e82c4c62a165b4f2a57720f Mon Sep 17 00:00:00 2001 From: Alex Kogon Date: Fri, 11 Sep 2015 14:41:36 +0200 Subject: [PATCH 06/14] add switch to turn strong text matching on and off --- src/org/synthuse/Config.java | 11 +++++++++++ src/org/synthuse/SynthuseDlg.java | 22 ++++++++++++++++++---- src/org/synthuse/XpathManager.java | 3 +-- 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/src/org/synthuse/Config.java b/src/org/synthuse/Config.java index a003d20..68c0553 100644 --- a/src/org/synthuse/Config.java +++ b/src/org/synthuse/Config.java @@ -20,6 +20,9 @@ public class Config extends PropertiesSerializer { public String xpathList = ""; public String xpathHightlight = ".*process=\"([^\"]*)\".*"; + private boolean useStrongTextMatching = false; + + public Config() //needed for cloning { } @@ -74,4 +77,12 @@ else if (this.targetKey.isEmpty()) keyStr = this.targetKey; return RobotMacro.getKeyCode(keyStr.charAt(0))[0]; } + + public boolean isUseStrongTextMatching() { + return useStrongTextMatching; + } + + public void setUseStrongTextMatching(boolean useStrongTextMatching) { + this.useStrongTextMatching = useStrongTextMatching; + } } diff --git a/src/org/synthuse/SynthuseDlg.java b/src/org/synthuse/SynthuseDlg.java index 48b0398..7a8a7c5 100644 --- a/src/org/synthuse/SynthuseDlg.java +++ b/src/org/synthuse/SynthuseDlg.java @@ -283,7 +283,7 @@ public void actionPerformed(ActionEvent arg0) { GridBagConstraints c = new GridBagConstraints(); c.fill = GridBagConstraints.HORIZONTAL; c.weightx = 0.5; - c.gridwidth = 1; + c.gridwidth = 2; c.gridx = 0; c.gridy = 0; c.insets = new Insets(3,3,3,3); // add padding around objects @@ -291,9 +291,23 @@ public void actionPerformed(ActionEvent arg0) { final DragTarget lblTarget = new DragTarget(); lblTarget.setHorizontalAlignment(SwingConstants.CENTER); - lblTarget.setIcon(new ImageIcon(SynthuseDlg.class.getResource(RES_STR_TARGET_IMG))); + final ImageIcon imageIcon = new ImageIcon(SynthuseDlg.class.getResource(RES_STR_TARGET_IMG)); + lblTarget.setMinimumSize(new Dimension(imageIcon.getIconWidth(), imageIcon.getIconHeight())); + lblTarget.setIcon(imageIcon); panel.add(lblTarget, c); + final JButton btnConfig = new JButton("Cfg"); + + btnConfig.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + SynthuseDlg.config.setUseStrongTextMatching(!SynthuseDlg.config.isUseStrongTextMatching()); + } + }); + c.gridx = 2; + c.gridwidth = 1; + panel.add(btnConfig, c); + btnFind = new JButton("Find"); btnFind.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { @@ -323,8 +337,8 @@ public void keyReleased(KeyEvent event) { } } }); - c.gridwidth = 3; - c.gridx = 1; + c.gridwidth = 1; + c.gridx = 3; panel.add(cmbXpath, c); btnFind.setIcon(new ImageIcon(SynthuseDlg.class.getResource(RES_STR_FIND_IMG))); c.gridwidth = 1; diff --git a/src/org/synthuse/XpathManager.java b/src/org/synthuse/XpathManager.java index 737be8d..76c73e9 100644 --- a/src/org/synthuse/XpathManager.java +++ b/src/org/synthuse/XpathManager.java @@ -52,8 +52,7 @@ public XpathManager(HWND hwnd, String enumProperties, JTextPane windowsXmlTextPa @Override public void run() { - //@TODO (AJK) create separate action to use text mathing - String results = buildXpathStatement(true,50,50); + String results = SynthuseDlg.config.isUseStrongTextMatching()?buildXpathStatement(true,50,50):buildXpathStatement(); events.executionCompleted(hwnd, results); } From 952d97cc4d03c4e4f577772416bdd76c0894a43e Mon Sep 17 00:00:00 2001 From: Alex Kogon Date: Sun, 13 Sep 2015 13:23:27 +0200 Subject: [PATCH 07/14] adding config in view module --- .../synthuse/views/SynthuseConfigPanel.java | 219 ++++++++++++++++++ synthuseViews/pom.xml | 13 ++ .../synthuse/views/SynthuseConfigPanel.form | 186 +++++++++++++++ .../synthuse/views/SynthuseConfigPanel.java | 219 ++++++++++++++++++ 4 files changed, 637 insertions(+) create mode 100755 src/org/synthuse/views/SynthuseConfigPanel.java create mode 100755 synthuseViews/pom.xml create mode 100755 synthuseViews/src/main/java/org/synthuse/views/SynthuseConfigPanel.form create mode 100755 synthuseViews/src/main/java/org/synthuse/views/SynthuseConfigPanel.java diff --git a/src/org/synthuse/views/SynthuseConfigPanel.java b/src/org/synthuse/views/SynthuseConfigPanel.java new file mode 100755 index 0000000..8f46084 --- /dev/null +++ b/src/org/synthuse/views/SynthuseConfigPanel.java @@ -0,0 +1,219 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.synthuse.views; + +import javax.swing.JCheckBox; +import javax.swing.JTextField; + +/** + * + * @author ux29sy + */ +public class SynthuseConfigPanel extends javax.swing.JPanel { + + /** + * Creates new form SynthuseConfigPanel + */ + public SynthuseConfigPanel() { + initComponents(); + } + + /** + * This method is called from within the constructor to initialize the form. + * WARNING: Do NOT modify this code. The content of this method is always + * regenerated by the Form Editor. + */ + @SuppressWarnings("unchecked") + // //GEN-BEGIN:initComponents + private void initComponents() { + java.awt.GridBagConstraints gridBagConstraints; + + theStrongTextMatchingCheckBox = new javax.swing.JCheckBox(); + theAlwaysOnTopCheckBox = new javax.swing.JCheckBox(); + theDisableUiaBridgeCheckBox = new javax.swing.JCheckBox(); + theDisableFiltersUiaCheckBox = new javax.swing.JCheckBox(); + jLabel1 = new javax.swing.JLabel(); + jLabel2 = new javax.swing.JLabel(); + jLabel3 = new javax.swing.JLabel(); + jLabel4 = new javax.swing.JLabel(); + filler1 = new javax.swing.Box.Filler(new java.awt.Dimension(0, 20), new java.awt.Dimension(0, 20), new java.awt.Dimension(0, 32767)); + filler2 = new javax.swing.Box.Filler(new java.awt.Dimension(90, 0), new java.awt.Dimension(90, 0), new java.awt.Dimension(32767, 0)); + theRefreshKeyTextField = new javax.swing.JTextField(); + theTargetKeyTextField = new javax.swing.JTextField(); + theXPathListTextField = new javax.swing.JTextField(); + theXPathHighlightTextField = new javax.swing.JTextField(); + + setLayout(new java.awt.GridBagLayout()); + + theStrongTextMatchingCheckBox.setText("Use Strong Text Matching"); + theStrongTextMatchingCheckBox.setHorizontalTextPosition(javax.swing.SwingConstants.LEADING); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 0; + gridBagConstraints.gridwidth = 2; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); + add(theStrongTextMatchingCheckBox, gridBagConstraints); + + theAlwaysOnTopCheckBox.setText("Always On Top"); + theAlwaysOnTopCheckBox.setHorizontalTextPosition(javax.swing.SwingConstants.LEADING); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 1; + gridBagConstraints.gridwidth = 2; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); + add(theAlwaysOnTopCheckBox, gridBagConstraints); + + theDisableUiaBridgeCheckBox.setText("Disable Uia Bridge"); + theDisableUiaBridgeCheckBox.setHorizontalTextPosition(javax.swing.SwingConstants.LEADING); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 2; + gridBagConstraints.gridwidth = 2; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); + add(theDisableUiaBridgeCheckBox, gridBagConstraints); + + theDisableFiltersUiaCheckBox.setText("Disable Filters Uia"); + theDisableFiltersUiaCheckBox.setHorizontalTextPosition(javax.swing.SwingConstants.LEADING); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 3; + gridBagConstraints.gridwidth = 2; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); + add(theDisableFiltersUiaCheckBox, gridBagConstraints); + + jLabel1.setText("Refresh Key:"); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 4; + gridBagConstraints.gridy = 0; + gridBagConstraints.gridheight = 2; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); + add(jLabel1, gridBagConstraints); + + jLabel2.setText("Target Key:"); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 4; + gridBagConstraints.gridy = 2; + gridBagConstraints.gridheight = 2; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); + add(jLabel2, gridBagConstraints); + + jLabel3.setText("XPath List:"); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 5; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.insets = new java.awt.Insets(6, 6, 6, 6); + add(jLabel3, gridBagConstraints); + + jLabel4.setText("XPath Highlight:"); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 6; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.insets = new java.awt.Insets(6, 6, 6, 6); + add(jLabel4, gridBagConstraints); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 4; + add(filler1, gridBagConstraints); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 2; + gridBagConstraints.gridy = 0; + add(filler2, gridBagConstraints); + + theRefreshKeyTextField.setText("XXXX"); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 5; + gridBagConstraints.gridy = 0; + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.gridheight = 2; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + add(theRefreshKeyTextField, gridBagConstraints); + + theTargetKeyTextField.setText("XXXX"); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 5; + gridBagConstraints.gridy = 2; + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.gridheight = 2; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + add(theTargetKeyTextField, gridBagConstraints); + + theXPathListTextField.setText("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 1; + gridBagConstraints.gridy = 5; + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.insets = new java.awt.Insets(6, 6, 6, 6); + add(theXPathListTextField, gridBagConstraints); + + theXPathHighlightTextField.setText("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 1; + gridBagConstraints.gridy = 6; + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.insets = new java.awt.Insets(6, 6, 6, 6); + add(theXPathHighlightTextField, gridBagConstraints); + }// //GEN-END:initComponents + + + // Variables declaration - do not modify//GEN-BEGIN:variables + private javax.swing.Box.Filler filler1; + private javax.swing.Box.Filler filler2; + private javax.swing.JLabel jLabel1; + private javax.swing.JLabel jLabel2; + private javax.swing.JLabel jLabel3; + private javax.swing.JLabel jLabel4; + private javax.swing.JCheckBox theAlwaysOnTopCheckBox; + private javax.swing.JCheckBox theDisableFiltersUiaCheckBox; + private javax.swing.JCheckBox theDisableUiaBridgeCheckBox; + private javax.swing.JTextField theRefreshKeyTextField; + private javax.swing.JCheckBox theStrongTextMatchingCheckBox; + private javax.swing.JTextField theTargetKeyTextField; + private javax.swing.JTextField theXPathHighlightTextField; + private javax.swing.JTextField theXPathListTextField; + // End of variables declaration//GEN-END:variables + + public JCheckBox getTheAlwaysOnTopCheckBox() { + return theAlwaysOnTopCheckBox; + } + + public JCheckBox getTheDisableFiltersUiaCheckBox() { + return theDisableFiltersUiaCheckBox; + } + + public JCheckBox getTheDisableUiaBridgeCheckBox() { + return theDisableUiaBridgeCheckBox; + } + + public JTextField getTheRefreshKeyTextField() { + return theRefreshKeyTextField; + } + + public JCheckBox getTheStrongTextMatchingCheckBox() { + return theStrongTextMatchingCheckBox; + } + + public JTextField getTheTargetKeyTextField() { + return theTargetKeyTextField; + } + + public JTextField getTheXPathHighlightTextField() { + return theXPathHighlightTextField; + } + + public JTextField getTheXPathListTextField() { + return theXPathListTextField; + } +} diff --git a/synthuseViews/pom.xml b/synthuseViews/pom.xml new file mode 100755 index 0000000..a8124db --- /dev/null +++ b/synthuseViews/pom.xml @@ -0,0 +1,13 @@ + + + 4.0.0 + synthuse + synthuseViews + 1.0.0-SNAPSHOT + jar + + UTF-8 + 1.7 + 1.7 + + \ No newline at end of file diff --git a/synthuseViews/src/main/java/org/synthuse/views/SynthuseConfigPanel.form b/synthuseViews/src/main/java/org/synthuse/views/SynthuseConfigPanel.form new file mode 100755 index 0000000..f2f8132 --- /dev/null +++ b/synthuseViews/src/main/java/org/synthuse/views/SynthuseConfigPanel.form @@ -0,0 +1,186 @@ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/synthuseViews/src/main/java/org/synthuse/views/SynthuseConfigPanel.java b/synthuseViews/src/main/java/org/synthuse/views/SynthuseConfigPanel.java new file mode 100755 index 0000000..8f46084 --- /dev/null +++ b/synthuseViews/src/main/java/org/synthuse/views/SynthuseConfigPanel.java @@ -0,0 +1,219 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.synthuse.views; + +import javax.swing.JCheckBox; +import javax.swing.JTextField; + +/** + * + * @author ux29sy + */ +public class SynthuseConfigPanel extends javax.swing.JPanel { + + /** + * Creates new form SynthuseConfigPanel + */ + public SynthuseConfigPanel() { + initComponents(); + } + + /** + * This method is called from within the constructor to initialize the form. + * WARNING: Do NOT modify this code. The content of this method is always + * regenerated by the Form Editor. + */ + @SuppressWarnings("unchecked") + // //GEN-BEGIN:initComponents + private void initComponents() { + java.awt.GridBagConstraints gridBagConstraints; + + theStrongTextMatchingCheckBox = new javax.swing.JCheckBox(); + theAlwaysOnTopCheckBox = new javax.swing.JCheckBox(); + theDisableUiaBridgeCheckBox = new javax.swing.JCheckBox(); + theDisableFiltersUiaCheckBox = new javax.swing.JCheckBox(); + jLabel1 = new javax.swing.JLabel(); + jLabel2 = new javax.swing.JLabel(); + jLabel3 = new javax.swing.JLabel(); + jLabel4 = new javax.swing.JLabel(); + filler1 = new javax.swing.Box.Filler(new java.awt.Dimension(0, 20), new java.awt.Dimension(0, 20), new java.awt.Dimension(0, 32767)); + filler2 = new javax.swing.Box.Filler(new java.awt.Dimension(90, 0), new java.awt.Dimension(90, 0), new java.awt.Dimension(32767, 0)); + theRefreshKeyTextField = new javax.swing.JTextField(); + theTargetKeyTextField = new javax.swing.JTextField(); + theXPathListTextField = new javax.swing.JTextField(); + theXPathHighlightTextField = new javax.swing.JTextField(); + + setLayout(new java.awt.GridBagLayout()); + + theStrongTextMatchingCheckBox.setText("Use Strong Text Matching"); + theStrongTextMatchingCheckBox.setHorizontalTextPosition(javax.swing.SwingConstants.LEADING); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 0; + gridBagConstraints.gridwidth = 2; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); + add(theStrongTextMatchingCheckBox, gridBagConstraints); + + theAlwaysOnTopCheckBox.setText("Always On Top"); + theAlwaysOnTopCheckBox.setHorizontalTextPosition(javax.swing.SwingConstants.LEADING); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 1; + gridBagConstraints.gridwidth = 2; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); + add(theAlwaysOnTopCheckBox, gridBagConstraints); + + theDisableUiaBridgeCheckBox.setText("Disable Uia Bridge"); + theDisableUiaBridgeCheckBox.setHorizontalTextPosition(javax.swing.SwingConstants.LEADING); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 2; + gridBagConstraints.gridwidth = 2; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); + add(theDisableUiaBridgeCheckBox, gridBagConstraints); + + theDisableFiltersUiaCheckBox.setText("Disable Filters Uia"); + theDisableFiltersUiaCheckBox.setHorizontalTextPosition(javax.swing.SwingConstants.LEADING); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 3; + gridBagConstraints.gridwidth = 2; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); + add(theDisableFiltersUiaCheckBox, gridBagConstraints); + + jLabel1.setText("Refresh Key:"); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 4; + gridBagConstraints.gridy = 0; + gridBagConstraints.gridheight = 2; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); + add(jLabel1, gridBagConstraints); + + jLabel2.setText("Target Key:"); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 4; + gridBagConstraints.gridy = 2; + gridBagConstraints.gridheight = 2; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); + add(jLabel2, gridBagConstraints); + + jLabel3.setText("XPath List:"); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 5; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.insets = new java.awt.Insets(6, 6, 6, 6); + add(jLabel3, gridBagConstraints); + + jLabel4.setText("XPath Highlight:"); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 6; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.insets = new java.awt.Insets(6, 6, 6, 6); + add(jLabel4, gridBagConstraints); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 4; + add(filler1, gridBagConstraints); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 2; + gridBagConstraints.gridy = 0; + add(filler2, gridBagConstraints); + + theRefreshKeyTextField.setText("XXXX"); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 5; + gridBagConstraints.gridy = 0; + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.gridheight = 2; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + add(theRefreshKeyTextField, gridBagConstraints); + + theTargetKeyTextField.setText("XXXX"); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 5; + gridBagConstraints.gridy = 2; + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.gridheight = 2; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + add(theTargetKeyTextField, gridBagConstraints); + + theXPathListTextField.setText("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 1; + gridBagConstraints.gridy = 5; + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.insets = new java.awt.Insets(6, 6, 6, 6); + add(theXPathListTextField, gridBagConstraints); + + theXPathHighlightTextField.setText("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 1; + gridBagConstraints.gridy = 6; + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.insets = new java.awt.Insets(6, 6, 6, 6); + add(theXPathHighlightTextField, gridBagConstraints); + }// //GEN-END:initComponents + + + // Variables declaration - do not modify//GEN-BEGIN:variables + private javax.swing.Box.Filler filler1; + private javax.swing.Box.Filler filler2; + private javax.swing.JLabel jLabel1; + private javax.swing.JLabel jLabel2; + private javax.swing.JLabel jLabel3; + private javax.swing.JLabel jLabel4; + private javax.swing.JCheckBox theAlwaysOnTopCheckBox; + private javax.swing.JCheckBox theDisableFiltersUiaCheckBox; + private javax.swing.JCheckBox theDisableUiaBridgeCheckBox; + private javax.swing.JTextField theRefreshKeyTextField; + private javax.swing.JCheckBox theStrongTextMatchingCheckBox; + private javax.swing.JTextField theTargetKeyTextField; + private javax.swing.JTextField theXPathHighlightTextField; + private javax.swing.JTextField theXPathListTextField; + // End of variables declaration//GEN-END:variables + + public JCheckBox getTheAlwaysOnTopCheckBox() { + return theAlwaysOnTopCheckBox; + } + + public JCheckBox getTheDisableFiltersUiaCheckBox() { + return theDisableFiltersUiaCheckBox; + } + + public JCheckBox getTheDisableUiaBridgeCheckBox() { + return theDisableUiaBridgeCheckBox; + } + + public JTextField getTheRefreshKeyTextField() { + return theRefreshKeyTextField; + } + + public JCheckBox getTheStrongTextMatchingCheckBox() { + return theStrongTextMatchingCheckBox; + } + + public JTextField getTheTargetKeyTextField() { + return theTargetKeyTextField; + } + + public JTextField getTheXPathHighlightTextField() { + return theXPathHighlightTextField; + } + + public JTextField getTheXPathListTextField() { + return theXPathListTextField; + } +} From 88683c835a29efe850df02c8c91ed50b3dcd375c Mon Sep 17 00:00:00 2001 From: Alex Kogon Date: Mon, 14 Sep 2015 11:08:38 +0200 Subject: [PATCH 08/14] creating dialog box to set synthuse properties --- src/org/synthuse/Config.java | 8 + src/org/synthuse/SynthuseConfigDialog.java | 49 ++ src/org/synthuse/SynthuseDlg.java | 13 +- .../synthuse/views/SynthuseConfigPanel.java | 438 +++++++++--------- 4 files changed, 288 insertions(+), 220 deletions(-) create mode 100755 src/org/synthuse/SynthuseConfigDialog.java diff --git a/src/org/synthuse/Config.java b/src/org/synthuse/Config.java index 68c0553..d4bcc22 100644 --- a/src/org/synthuse/Config.java +++ b/src/org/synthuse/Config.java @@ -85,4 +85,12 @@ public boolean isUseStrongTextMatching() { public void setUseStrongTextMatching(boolean useStrongTextMatching) { this.useStrongTextMatching = useStrongTextMatching; } + + public String getXpathList() { + return xpathList; + } + + public String getXpathHighlight() { + return xpathHightlight; + } } diff --git a/src/org/synthuse/SynthuseConfigDialog.java b/src/org/synthuse/SynthuseConfigDialog.java new file mode 100755 index 0000000..d9d4938 --- /dev/null +++ b/src/org/synthuse/SynthuseConfigDialog.java @@ -0,0 +1,49 @@ +package org.synthuse; + +import javax.swing.JDialog; +import javax.swing.JFrame; +import javax.swing.SwingUtilities; + +import org.synthuse.views.SynthuseConfigPanel; + +public class SynthuseConfigDialog extends JDialog { + + /** + * + */ + private static final long serialVersionUID = -4877764256323621418L; + + private Config theConfig; //Model + private final SynthuseConfigPanel theSynthuseConfigPanel; //View + + public SynthuseConfigDialog(JFrame aParentFrame, Config aConfig) { + super(aParentFrame); + this.setTitle("Synthuse Properties"); + theSynthuseConfigPanel = new SynthuseConfigPanel(); + this.setConfig(aConfig); + this.getContentPane().add(theSynthuseConfigPanel); + this.setSize(492, 260); + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + SynthuseConfigDialog.this.initializeUI(); + } + }); + } + + synchronized private void initializeUI() { + theSynthuseConfigPanel.getAlwaysOnTopCheckBox().setSelected(theConfig.isAlwaysOnTop()); + theSynthuseConfigPanel.getDisableFiltersUiaCheckBox().setSelected(theConfig.isFilterUiaDisabled()); + theSynthuseConfigPanel.getDisableUiaBridgeCheckBox().setSelected(theConfig.isUiaBridgeDisabled()); + theSynthuseConfigPanel.getRefreshKeyTextField().setText(Integer.toString(theConfig.getRefreshKeyCode())); + theSynthuseConfigPanel.getStrongTextMatchingCheckBox().setSelected(theConfig.isUseStrongTextMatching()); + theSynthuseConfigPanel.getTargetKeyTextField().setText(Integer.toString(theConfig.getTargetKeyCode())); + theSynthuseConfigPanel.getXPathHighlightTextField().setText(theConfig.getXpathHighlight()); + theSynthuseConfigPanel.getXPathListTextField().setText(theConfig.getXpathList()); + } + + synchronized private void setConfig(Config aConfig) { + theConfig = aConfig; + } + +} diff --git a/src/org/synthuse/SynthuseDlg.java b/src/org/synthuse/SynthuseDlg.java index 7a8a7c5..3e66437 100644 --- a/src/org/synthuse/SynthuseDlg.java +++ b/src/org/synthuse/SynthuseDlg.java @@ -43,6 +43,7 @@ import org.synthuse.Api.User32Ex; import org.synthuse.DragTarget.dragEvents; +import org.synthuse.views.SynthuseConfigPanel; @@ -85,6 +86,7 @@ public class SynthuseDlg extends JFrame { private JButton btnAdvanced; private TestIdeFrame testIde = null; + protected SynthuseConfigDialog configDialog=null; //private MessageHookFrame msgHook = null; private int targetX; private int targetY; @@ -301,8 +303,12 @@ public void actionPerformed(ActionEvent arg0) { btnConfig.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - SynthuseDlg.config.setUseStrongTextMatching(!SynthuseDlg.config.isUseStrongTextMatching()); + if(configDialog==null) { + createConfigDialog(); + } + configDialog.setVisible(true); } + }); c.gridx = 2; c.gridwidth = 1; @@ -576,4 +582,9 @@ public void disposeWindow() WindowEvent closingEvent = new WindowEvent(this, WindowEvent.WINDOW_CLOSING); Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(closingEvent); } + + private void createConfigDialog() { + configDialog=new SynthuseConfigDialog(this, config); + configDialog.setLocationRelativeTo(null); + } } diff --git a/src/org/synthuse/views/SynthuseConfigPanel.java b/src/org/synthuse/views/SynthuseConfigPanel.java index 8f46084..81474ef 100755 --- a/src/org/synthuse/views/SynthuseConfigPanel.java +++ b/src/org/synthuse/views/SynthuseConfigPanel.java @@ -1,219 +1,219 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ -package org.synthuse.views; - -import javax.swing.JCheckBox; -import javax.swing.JTextField; - -/** - * - * @author ux29sy - */ -public class SynthuseConfigPanel extends javax.swing.JPanel { - - /** - * Creates new form SynthuseConfigPanel - */ - public SynthuseConfigPanel() { - initComponents(); - } - - /** - * This method is called from within the constructor to initialize the form. - * WARNING: Do NOT modify this code. The content of this method is always - * regenerated by the Form Editor. - */ - @SuppressWarnings("unchecked") - // //GEN-BEGIN:initComponents - private void initComponents() { - java.awt.GridBagConstraints gridBagConstraints; - - theStrongTextMatchingCheckBox = new javax.swing.JCheckBox(); - theAlwaysOnTopCheckBox = new javax.swing.JCheckBox(); - theDisableUiaBridgeCheckBox = new javax.swing.JCheckBox(); - theDisableFiltersUiaCheckBox = new javax.swing.JCheckBox(); - jLabel1 = new javax.swing.JLabel(); - jLabel2 = new javax.swing.JLabel(); - jLabel3 = new javax.swing.JLabel(); - jLabel4 = new javax.swing.JLabel(); - filler1 = new javax.swing.Box.Filler(new java.awt.Dimension(0, 20), new java.awt.Dimension(0, 20), new java.awt.Dimension(0, 32767)); - filler2 = new javax.swing.Box.Filler(new java.awt.Dimension(90, 0), new java.awt.Dimension(90, 0), new java.awt.Dimension(32767, 0)); - theRefreshKeyTextField = new javax.swing.JTextField(); - theTargetKeyTextField = new javax.swing.JTextField(); - theXPathListTextField = new javax.swing.JTextField(); - theXPathHighlightTextField = new javax.swing.JTextField(); - - setLayout(new java.awt.GridBagLayout()); - - theStrongTextMatchingCheckBox.setText("Use Strong Text Matching"); - theStrongTextMatchingCheckBox.setHorizontalTextPosition(javax.swing.SwingConstants.LEADING); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 0; - gridBagConstraints.gridwidth = 2; - gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; - gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); - add(theStrongTextMatchingCheckBox, gridBagConstraints); - - theAlwaysOnTopCheckBox.setText("Always On Top"); - theAlwaysOnTopCheckBox.setHorizontalTextPosition(javax.swing.SwingConstants.LEADING); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 1; - gridBagConstraints.gridwidth = 2; - gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; - gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); - add(theAlwaysOnTopCheckBox, gridBagConstraints); - - theDisableUiaBridgeCheckBox.setText("Disable Uia Bridge"); - theDisableUiaBridgeCheckBox.setHorizontalTextPosition(javax.swing.SwingConstants.LEADING); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 2; - gridBagConstraints.gridwidth = 2; - gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; - gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); - add(theDisableUiaBridgeCheckBox, gridBagConstraints); - - theDisableFiltersUiaCheckBox.setText("Disable Filters Uia"); - theDisableFiltersUiaCheckBox.setHorizontalTextPosition(javax.swing.SwingConstants.LEADING); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 3; - gridBagConstraints.gridwidth = 2; - gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; - gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); - add(theDisableFiltersUiaCheckBox, gridBagConstraints); - - jLabel1.setText("Refresh Key:"); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 4; - gridBagConstraints.gridy = 0; - gridBagConstraints.gridheight = 2; - gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; - gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); - add(jLabel1, gridBagConstraints); - - jLabel2.setText("Target Key:"); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 4; - gridBagConstraints.gridy = 2; - gridBagConstraints.gridheight = 2; - gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; - gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); - add(jLabel2, gridBagConstraints); - - jLabel3.setText("XPath List:"); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 5; - gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; - gridBagConstraints.insets = new java.awt.Insets(6, 6, 6, 6); - add(jLabel3, gridBagConstraints); - - jLabel4.setText("XPath Highlight:"); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 6; - gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; - gridBagConstraints.insets = new java.awt.Insets(6, 6, 6, 6); - add(jLabel4, gridBagConstraints); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 4; - add(filler1, gridBagConstraints); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 2; - gridBagConstraints.gridy = 0; - add(filler2, gridBagConstraints); - - theRefreshKeyTextField.setText("XXXX"); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 5; - gridBagConstraints.gridy = 0; - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.gridheight = 2; - gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; - add(theRefreshKeyTextField, gridBagConstraints); - - theTargetKeyTextField.setText("XXXX"); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 5; - gridBagConstraints.gridy = 2; - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.gridheight = 2; - gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; - add(theTargetKeyTextField, gridBagConstraints); - - theXPathListTextField.setText("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 1; - gridBagConstraints.gridy = 5; - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; - gridBagConstraints.insets = new java.awt.Insets(6, 6, 6, 6); - add(theXPathListTextField, gridBagConstraints); - - theXPathHighlightTextField.setText("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 1; - gridBagConstraints.gridy = 6; - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; - gridBagConstraints.insets = new java.awt.Insets(6, 6, 6, 6); - add(theXPathHighlightTextField, gridBagConstraints); - }// //GEN-END:initComponents - - - // Variables declaration - do not modify//GEN-BEGIN:variables - private javax.swing.Box.Filler filler1; - private javax.swing.Box.Filler filler2; - private javax.swing.JLabel jLabel1; - private javax.swing.JLabel jLabel2; - private javax.swing.JLabel jLabel3; - private javax.swing.JLabel jLabel4; - private javax.swing.JCheckBox theAlwaysOnTopCheckBox; - private javax.swing.JCheckBox theDisableFiltersUiaCheckBox; - private javax.swing.JCheckBox theDisableUiaBridgeCheckBox; - private javax.swing.JTextField theRefreshKeyTextField; - private javax.swing.JCheckBox theStrongTextMatchingCheckBox; - private javax.swing.JTextField theTargetKeyTextField; - private javax.swing.JTextField theXPathHighlightTextField; - private javax.swing.JTextField theXPathListTextField; - // End of variables declaration//GEN-END:variables - - public JCheckBox getTheAlwaysOnTopCheckBox() { - return theAlwaysOnTopCheckBox; - } - - public JCheckBox getTheDisableFiltersUiaCheckBox() { - return theDisableFiltersUiaCheckBox; - } - - public JCheckBox getTheDisableUiaBridgeCheckBox() { - return theDisableUiaBridgeCheckBox; - } - - public JTextField getTheRefreshKeyTextField() { - return theRefreshKeyTextField; - } - - public JCheckBox getTheStrongTextMatchingCheckBox() { - return theStrongTextMatchingCheckBox; - } - - public JTextField getTheTargetKeyTextField() { - return theTargetKeyTextField; - } - - public JTextField getTheXPathHighlightTextField() { - return theXPathHighlightTextField; - } - - public JTextField getTheXPathListTextField() { - return theXPathListTextField; - } -} +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.synthuse.views; + +import javax.swing.JCheckBox; +import javax.swing.JTextField; + +/** + * + * @author ux29sy + */ +public class SynthuseConfigPanel extends javax.swing.JPanel { + + /** + * Creates new form SynthuseConfigPanel + */ + public SynthuseConfigPanel() { + initComponents(); + } + + /** + * This method is called from within the constructor to initialize the form. + * WARNING: Do NOT modify this code. The content of this method is always + * regenerated by the Form Editor. + */ + @SuppressWarnings("unchecked") + // + private void initComponents() { + java.awt.GridBagConstraints gridBagConstraints; + + theStrongTextMatchingCheckBox = new javax.swing.JCheckBox(); + theAlwaysOnTopCheckBox = new javax.swing.JCheckBox(); + theDisableUiaBridgeCheckBox = new javax.swing.JCheckBox(); + theDisableFiltersUiaCheckBox = new javax.swing.JCheckBox(); + jLabel1 = new javax.swing.JLabel(); + jLabel2 = new javax.swing.JLabel(); + jLabel3 = new javax.swing.JLabel(); + jLabel4 = new javax.swing.JLabel(); + filler1 = new javax.swing.Box.Filler(new java.awt.Dimension(0, 20), new java.awt.Dimension(0, 20), new java.awt.Dimension(0, 32767)); + filler2 = new javax.swing.Box.Filler(new java.awt.Dimension(90, 0), new java.awt.Dimension(90, 0), new java.awt.Dimension(32767, 0)); + theRefreshKeyTextField = new javax.swing.JTextField(); + theTargetKeyTextField = new javax.swing.JTextField(); + theXPathListTextField = new javax.swing.JTextField(); + theXPathHighlightTextField = new javax.swing.JTextField(); + + setLayout(new java.awt.GridBagLayout()); + + theStrongTextMatchingCheckBox.setText("Use Strong Text Matching"); + theStrongTextMatchingCheckBox.setHorizontalTextPosition(javax.swing.SwingConstants.LEADING); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 0; + gridBagConstraints.gridwidth = 2; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); + add(theStrongTextMatchingCheckBox, gridBagConstraints); + + theAlwaysOnTopCheckBox.setText("Always On Top"); + theAlwaysOnTopCheckBox.setHorizontalTextPosition(javax.swing.SwingConstants.LEADING); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 1; + gridBagConstraints.gridwidth = 2; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); + add(theAlwaysOnTopCheckBox, gridBagConstraints); + + theDisableUiaBridgeCheckBox.setText("Disable Uia Bridge"); + theDisableUiaBridgeCheckBox.setHorizontalTextPosition(javax.swing.SwingConstants.LEADING); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 2; + gridBagConstraints.gridwidth = 2; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); + add(theDisableUiaBridgeCheckBox, gridBagConstraints); + + theDisableFiltersUiaCheckBox.setText("Disable Filters Uia"); + theDisableFiltersUiaCheckBox.setHorizontalTextPosition(javax.swing.SwingConstants.LEADING); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 3; + gridBagConstraints.gridwidth = 2; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); + add(theDisableFiltersUiaCheckBox, gridBagConstraints); + + jLabel1.setText("Refresh Key:"); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 4; + gridBagConstraints.gridy = 0; + gridBagConstraints.gridheight = 2; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); + add(jLabel1, gridBagConstraints); + + jLabel2.setText("Target Key:"); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 4; + gridBagConstraints.gridy = 2; + gridBagConstraints.gridheight = 2; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); + add(jLabel2, gridBagConstraints); + + jLabel3.setText("XPath List:"); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 5; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.insets = new java.awt.Insets(6, 6, 6, 6); + add(jLabel3, gridBagConstraints); + + jLabel4.setText("XPath Highlight:"); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 6; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.insets = new java.awt.Insets(6, 6, 6, 6); + add(jLabel4, gridBagConstraints); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 4; + add(filler1, gridBagConstraints); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 2; + gridBagConstraints.gridy = 0; + add(filler2, gridBagConstraints); + + theRefreshKeyTextField.setText("XXXX"); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 5; + gridBagConstraints.gridy = 0; + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.gridheight = 2; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + add(theRefreshKeyTextField, gridBagConstraints); + + theTargetKeyTextField.setText("XXXX"); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 5; + gridBagConstraints.gridy = 2; + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.gridheight = 2; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + add(theTargetKeyTextField, gridBagConstraints); + + theXPathListTextField.setText("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 1; + gridBagConstraints.gridy = 5; + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.insets = new java.awt.Insets(6, 6, 6, 6); + add(theXPathListTextField, gridBagConstraints); + + theXPathHighlightTextField.setText("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 1; + gridBagConstraints.gridy = 6; + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.insets = new java.awt.Insets(6, 6, 6, 6); + add(theXPathHighlightTextField, gridBagConstraints); + }// + + + // Variables declaration - do not modify + private javax.swing.Box.Filler filler1; + private javax.swing.Box.Filler filler2; + private javax.swing.JLabel jLabel1; + private javax.swing.JLabel jLabel2; + private javax.swing.JLabel jLabel3; + private javax.swing.JLabel jLabel4; + private javax.swing.JCheckBox theAlwaysOnTopCheckBox; + private javax.swing.JCheckBox theDisableFiltersUiaCheckBox; + private javax.swing.JCheckBox theDisableUiaBridgeCheckBox; + private javax.swing.JTextField theRefreshKeyTextField; + private javax.swing.JCheckBox theStrongTextMatchingCheckBox; + private javax.swing.JTextField theTargetKeyTextField; + private javax.swing.JTextField theXPathHighlightTextField; + private javax.swing.JTextField theXPathListTextField; + // End of variables declaration + + public JCheckBox getAlwaysOnTopCheckBox() { + return theAlwaysOnTopCheckBox; + } + + public JCheckBox getDisableFiltersUiaCheckBox() { + return theDisableFiltersUiaCheckBox; + } + + public JCheckBox getDisableUiaBridgeCheckBox() { + return theDisableUiaBridgeCheckBox; + } + + public JTextField getRefreshKeyTextField() { + return theRefreshKeyTextField; + } + + public JCheckBox getStrongTextMatchingCheckBox() { + return theStrongTextMatchingCheckBox; + } + + public JTextField getTargetKeyTextField() { + return theTargetKeyTextField; + } + + public JTextField getXPathHighlightTextField() { + return theXPathHighlightTextField; + } + + public JTextField getXPathListTextField() { + return theXPathListTextField; + } +} From 0d8bb2a8423f86b48438544409fd10629b13bb71 Mon Sep 17 00:00:00 2001 From: Alex Kogon Date: Mon, 14 Sep 2015 11:09:54 +0200 Subject: [PATCH 09/14] removed subproject --- synthuseViews/pom.xml | 13 -- .../synthuse/views/SynthuseConfigPanel.form | 186 --------------- .../synthuse/views/SynthuseConfigPanel.java | 219 ------------------ 3 files changed, 418 deletions(-) delete mode 100755 synthuseViews/pom.xml delete mode 100755 synthuseViews/src/main/java/org/synthuse/views/SynthuseConfigPanel.form delete mode 100755 synthuseViews/src/main/java/org/synthuse/views/SynthuseConfigPanel.java diff --git a/synthuseViews/pom.xml b/synthuseViews/pom.xml deleted file mode 100755 index a8124db..0000000 --- a/synthuseViews/pom.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - 4.0.0 - synthuse - synthuseViews - 1.0.0-SNAPSHOT - jar - - UTF-8 - 1.7 - 1.7 - - \ No newline at end of file diff --git a/synthuseViews/src/main/java/org/synthuse/views/SynthuseConfigPanel.form b/synthuseViews/src/main/java/org/synthuse/views/SynthuseConfigPanel.form deleted file mode 100755 index f2f8132..0000000 --- a/synthuseViews/src/main/java/org/synthuse/views/SynthuseConfigPanel.form +++ /dev/null @@ -1,186 +0,0 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/synthuseViews/src/main/java/org/synthuse/views/SynthuseConfigPanel.java b/synthuseViews/src/main/java/org/synthuse/views/SynthuseConfigPanel.java deleted file mode 100755 index 8f46084..0000000 --- a/synthuseViews/src/main/java/org/synthuse/views/SynthuseConfigPanel.java +++ /dev/null @@ -1,219 +0,0 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ -package org.synthuse.views; - -import javax.swing.JCheckBox; -import javax.swing.JTextField; - -/** - * - * @author ux29sy - */ -public class SynthuseConfigPanel extends javax.swing.JPanel { - - /** - * Creates new form SynthuseConfigPanel - */ - public SynthuseConfigPanel() { - initComponents(); - } - - /** - * This method is called from within the constructor to initialize the form. - * WARNING: Do NOT modify this code. The content of this method is always - * regenerated by the Form Editor. - */ - @SuppressWarnings("unchecked") - // //GEN-BEGIN:initComponents - private void initComponents() { - java.awt.GridBagConstraints gridBagConstraints; - - theStrongTextMatchingCheckBox = new javax.swing.JCheckBox(); - theAlwaysOnTopCheckBox = new javax.swing.JCheckBox(); - theDisableUiaBridgeCheckBox = new javax.swing.JCheckBox(); - theDisableFiltersUiaCheckBox = new javax.swing.JCheckBox(); - jLabel1 = new javax.swing.JLabel(); - jLabel2 = new javax.swing.JLabel(); - jLabel3 = new javax.swing.JLabel(); - jLabel4 = new javax.swing.JLabel(); - filler1 = new javax.swing.Box.Filler(new java.awt.Dimension(0, 20), new java.awt.Dimension(0, 20), new java.awt.Dimension(0, 32767)); - filler2 = new javax.swing.Box.Filler(new java.awt.Dimension(90, 0), new java.awt.Dimension(90, 0), new java.awt.Dimension(32767, 0)); - theRefreshKeyTextField = new javax.swing.JTextField(); - theTargetKeyTextField = new javax.swing.JTextField(); - theXPathListTextField = new javax.swing.JTextField(); - theXPathHighlightTextField = new javax.swing.JTextField(); - - setLayout(new java.awt.GridBagLayout()); - - theStrongTextMatchingCheckBox.setText("Use Strong Text Matching"); - theStrongTextMatchingCheckBox.setHorizontalTextPosition(javax.swing.SwingConstants.LEADING); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 0; - gridBagConstraints.gridwidth = 2; - gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; - gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); - add(theStrongTextMatchingCheckBox, gridBagConstraints); - - theAlwaysOnTopCheckBox.setText("Always On Top"); - theAlwaysOnTopCheckBox.setHorizontalTextPosition(javax.swing.SwingConstants.LEADING); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 1; - gridBagConstraints.gridwidth = 2; - gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; - gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); - add(theAlwaysOnTopCheckBox, gridBagConstraints); - - theDisableUiaBridgeCheckBox.setText("Disable Uia Bridge"); - theDisableUiaBridgeCheckBox.setHorizontalTextPosition(javax.swing.SwingConstants.LEADING); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 2; - gridBagConstraints.gridwidth = 2; - gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; - gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); - add(theDisableUiaBridgeCheckBox, gridBagConstraints); - - theDisableFiltersUiaCheckBox.setText("Disable Filters Uia"); - theDisableFiltersUiaCheckBox.setHorizontalTextPosition(javax.swing.SwingConstants.LEADING); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 3; - gridBagConstraints.gridwidth = 2; - gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; - gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); - add(theDisableFiltersUiaCheckBox, gridBagConstraints); - - jLabel1.setText("Refresh Key:"); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 4; - gridBagConstraints.gridy = 0; - gridBagConstraints.gridheight = 2; - gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; - gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); - add(jLabel1, gridBagConstraints); - - jLabel2.setText("Target Key:"); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 4; - gridBagConstraints.gridy = 2; - gridBagConstraints.gridheight = 2; - gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; - gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); - add(jLabel2, gridBagConstraints); - - jLabel3.setText("XPath List:"); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 5; - gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; - gridBagConstraints.insets = new java.awt.Insets(6, 6, 6, 6); - add(jLabel3, gridBagConstraints); - - jLabel4.setText("XPath Highlight:"); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 6; - gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; - gridBagConstraints.insets = new java.awt.Insets(6, 6, 6, 6); - add(jLabel4, gridBagConstraints); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 4; - add(filler1, gridBagConstraints); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 2; - gridBagConstraints.gridy = 0; - add(filler2, gridBagConstraints); - - theRefreshKeyTextField.setText("XXXX"); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 5; - gridBagConstraints.gridy = 0; - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.gridheight = 2; - gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; - add(theRefreshKeyTextField, gridBagConstraints); - - theTargetKeyTextField.setText("XXXX"); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 5; - gridBagConstraints.gridy = 2; - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.gridheight = 2; - gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; - add(theTargetKeyTextField, gridBagConstraints); - - theXPathListTextField.setText("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 1; - gridBagConstraints.gridy = 5; - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; - gridBagConstraints.insets = new java.awt.Insets(6, 6, 6, 6); - add(theXPathListTextField, gridBagConstraints); - - theXPathHighlightTextField.setText("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 1; - gridBagConstraints.gridy = 6; - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; - gridBagConstraints.insets = new java.awt.Insets(6, 6, 6, 6); - add(theXPathHighlightTextField, gridBagConstraints); - }// //GEN-END:initComponents - - - // Variables declaration - do not modify//GEN-BEGIN:variables - private javax.swing.Box.Filler filler1; - private javax.swing.Box.Filler filler2; - private javax.swing.JLabel jLabel1; - private javax.swing.JLabel jLabel2; - private javax.swing.JLabel jLabel3; - private javax.swing.JLabel jLabel4; - private javax.swing.JCheckBox theAlwaysOnTopCheckBox; - private javax.swing.JCheckBox theDisableFiltersUiaCheckBox; - private javax.swing.JCheckBox theDisableUiaBridgeCheckBox; - private javax.swing.JTextField theRefreshKeyTextField; - private javax.swing.JCheckBox theStrongTextMatchingCheckBox; - private javax.swing.JTextField theTargetKeyTextField; - private javax.swing.JTextField theXPathHighlightTextField; - private javax.swing.JTextField theXPathListTextField; - // End of variables declaration//GEN-END:variables - - public JCheckBox getTheAlwaysOnTopCheckBox() { - return theAlwaysOnTopCheckBox; - } - - public JCheckBox getTheDisableFiltersUiaCheckBox() { - return theDisableFiltersUiaCheckBox; - } - - public JCheckBox getTheDisableUiaBridgeCheckBox() { - return theDisableUiaBridgeCheckBox; - } - - public JTextField getTheRefreshKeyTextField() { - return theRefreshKeyTextField; - } - - public JCheckBox getTheStrongTextMatchingCheckBox() { - return theStrongTextMatchingCheckBox; - } - - public JTextField getTheTargetKeyTextField() { - return theTargetKeyTextField; - } - - public JTextField getTheXPathHighlightTextField() { - return theXPathHighlightTextField; - } - - public JTextField getTheXPathListTextField() { - return theXPathListTextField; - } -} From 7f2df7ca9c2e08872a7115ce37497075964b13f6 Mon Sep 17 00:00:00 2001 From: Alex Kogon Date: Mon, 14 Sep 2015 11:16:57 +0200 Subject: [PATCH 10/14] refactored controllers out --- src/org/synthuse/SynthuseConfigDialog.java | 15 ++------------- .../SynthuseConfigDialogControllers.java | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 13 deletions(-) create mode 100755 src/org/synthuse/controllers/SynthuseConfigDialogControllers.java diff --git a/src/org/synthuse/SynthuseConfigDialog.java b/src/org/synthuse/SynthuseConfigDialog.java index d9d4938..c804e37 100755 --- a/src/org/synthuse/SynthuseConfigDialog.java +++ b/src/org/synthuse/SynthuseConfigDialog.java @@ -4,6 +4,7 @@ import javax.swing.JFrame; import javax.swing.SwingUtilities; +import org.synthuse.controllers.SynthuseConfigDialogControllers; import org.synthuse.views.SynthuseConfigPanel; public class SynthuseConfigDialog extends JDialog { @@ -26,24 +27,12 @@ public SynthuseConfigDialog(JFrame aParentFrame, Config aConfig) { SwingUtilities.invokeLater(new Runnable() { @Override public void run() { - SynthuseConfigDialog.this.initializeUI(); + SynthuseConfigDialogControllers.initializeUI(theSynthuseConfigPanel,theConfig); } }); } - synchronized private void initializeUI() { - theSynthuseConfigPanel.getAlwaysOnTopCheckBox().setSelected(theConfig.isAlwaysOnTop()); - theSynthuseConfigPanel.getDisableFiltersUiaCheckBox().setSelected(theConfig.isFilterUiaDisabled()); - theSynthuseConfigPanel.getDisableUiaBridgeCheckBox().setSelected(theConfig.isUiaBridgeDisabled()); - theSynthuseConfigPanel.getRefreshKeyTextField().setText(Integer.toString(theConfig.getRefreshKeyCode())); - theSynthuseConfigPanel.getStrongTextMatchingCheckBox().setSelected(theConfig.isUseStrongTextMatching()); - theSynthuseConfigPanel.getTargetKeyTextField().setText(Integer.toString(theConfig.getTargetKeyCode())); - theSynthuseConfigPanel.getXPathHighlightTextField().setText(theConfig.getXpathHighlight()); - theSynthuseConfigPanel.getXPathListTextField().setText(theConfig.getXpathList()); - } - synchronized private void setConfig(Config aConfig) { theConfig = aConfig; } - } diff --git a/src/org/synthuse/controllers/SynthuseConfigDialogControllers.java b/src/org/synthuse/controllers/SynthuseConfigDialogControllers.java new file mode 100755 index 0000000..91ddb59 --- /dev/null +++ b/src/org/synthuse/controllers/SynthuseConfigDialogControllers.java @@ -0,0 +1,19 @@ +package org.synthuse.controllers; + +import org.synthuse.Config; +import org.synthuse.views.SynthuseConfigPanel; + +public class SynthuseConfigDialogControllers { + + public static void initializeUI(SynthuseConfigPanel aSynthuseConfigPanel, Config aConfig) { + aSynthuseConfigPanel.getAlwaysOnTopCheckBox().setSelected(aConfig.isAlwaysOnTop()); + aSynthuseConfigPanel.getDisableFiltersUiaCheckBox().setSelected(aConfig.isFilterUiaDisabled()); + aSynthuseConfigPanel.getDisableUiaBridgeCheckBox().setSelected(aConfig.isUiaBridgeDisabled()); + aSynthuseConfigPanel.getRefreshKeyTextField().setText(Integer.toString(aConfig.getRefreshKeyCode())); + aSynthuseConfigPanel.getStrongTextMatchingCheckBox().setSelected(aConfig.isUseStrongTextMatching()); + aSynthuseConfigPanel.getTargetKeyTextField().setText(Integer.toString(aConfig.getTargetKeyCode())); + aSynthuseConfigPanel.getXPathHighlightTextField().setText(aConfig.getXpathHighlight()); + aSynthuseConfigPanel.getXPathListTextField().setText(aConfig.getXpathList()); + } + +} From 4cf426eb99b4885a1b01cdd0ffa889759ec409e1 Mon Sep 17 00:00:00 2001 From: Alex Kogon Date: Mon, 14 Sep 2015 11:57:58 +0200 Subject: [PATCH 11/14] added action handlers for config dialog --- src/org/synthuse/Config.java | 32 +++++++ src/org/synthuse/SynthuseConfigDialog.java | 9 +- .../SynthuseConfigDialogControllers.java | 93 +++++++++++++++++++ 3 files changed, 133 insertions(+), 1 deletion(-) diff --git a/src/org/synthuse/Config.java b/src/org/synthuse/Config.java index d4bcc22..eac3346 100644 --- a/src/org/synthuse/Config.java +++ b/src/org/synthuse/Config.java @@ -40,6 +40,12 @@ public boolean isUiaBridgeDisabled() return disableUiaBridge.equals("true") || disableUiaBridge.equals("True"); } + + public void setDisableUiaBridge(boolean aNewValue) { + disableUiaBridge=aNewValue?"true":"false"; + } + + public boolean isFilterUiaDisabled() { if (disableFiltersUia == null) @@ -47,6 +53,11 @@ public boolean isFilterUiaDisabled() return disableFiltersUia.equals("true") || disableFiltersUia.equals("True"); } + public void setDisableFiltersUia(boolean aNewValue) { + disableFiltersUia=aNewValue?"true":"false"; + } + + public boolean isAlwaysOnTop() { if (alwaysOnTop == null) @@ -54,6 +65,11 @@ public boolean isAlwaysOnTop() return alwaysOnTop.equals("true") || alwaysOnTop.equals("True"); } + public void setAlwaysOnTop(boolean aNewValue) + { + alwaysOnTop=aNewValue?"true":"false"; + } + public int getRefreshKeyCode() { String keyStr = ""; @@ -65,6 +81,10 @@ else if (this.refreshKey.isEmpty()) keyStr = this.refreshKey; return RobotMacro.getKeyCode(keyStr.charAt(0))[0]; } + + public void setRefreshKeyCode(String aText) { + this.refreshKey=aText; + } public int getTargetKeyCode() { @@ -78,6 +98,10 @@ else if (this.targetKey.isEmpty()) return RobotMacro.getKeyCode(keyStr.charAt(0))[0]; } + public void setTargetKeyCode(String aText) { + this.targetKey=aText; + } + public boolean isUseStrongTextMatching() { return useStrongTextMatching; } @@ -90,7 +114,15 @@ public String getXpathList() { return xpathList; } + public void setXPathList(String aText) { + xpathList=aText; + } + public String getXpathHighlight() { return xpathHightlight; } + + public void setXPathHighlight(String aText) { + xpathHightlight=aText; + } } diff --git a/src/org/synthuse/SynthuseConfigDialog.java b/src/org/synthuse/SynthuseConfigDialog.java index c804e37..3c4fa25 100755 --- a/src/org/synthuse/SynthuseConfigDialog.java +++ b/src/org/synthuse/SynthuseConfigDialog.java @@ -19,11 +19,18 @@ public class SynthuseConfigDialog extends JDialog { public SynthuseConfigDialog(JFrame aParentFrame, Config aConfig) { super(aParentFrame); + + this.setConfig(aConfig); + this.setTitle("Synthuse Properties"); + theSynthuseConfigPanel = new SynthuseConfigPanel(); - this.setConfig(aConfig); + + SynthuseConfigDialogControllers.bindActionControllers(theSynthuseConfigPanel,theConfig); + this.getContentPane().add(theSynthuseConfigPanel); this.setSize(492, 260); + SwingUtilities.invokeLater(new Runnable() { @Override public void run() { diff --git a/src/org/synthuse/controllers/SynthuseConfigDialogControllers.java b/src/org/synthuse/controllers/SynthuseConfigDialogControllers.java index 91ddb59..4b556dc 100755 --- a/src/org/synthuse/controllers/SynthuseConfigDialogControllers.java +++ b/src/org/synthuse/controllers/SynthuseConfigDialogControllers.java @@ -1,5 +1,8 @@ package org.synthuse.controllers; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; + import org.synthuse.Config; import org.synthuse.views.SynthuseConfigPanel; @@ -16,4 +19,94 @@ public static void initializeUI(SynthuseConfigPanel aSynthuseConfigPanel, Config aSynthuseConfigPanel.getXPathListTextField().setText(aConfig.getXpathList()); } + public static void bindActionControllers(final SynthuseConfigPanel aSynthuseConfigPanel, final Config aConfig) { + aSynthuseConfigPanel.getAlwaysOnTopCheckBox().addActionListener(alwaysOnTopCheckboxActionHandler(aSynthuseConfigPanel, aConfig)); + aSynthuseConfigPanel.getDisableFiltersUiaCheckBox().addActionListener(disableFiltersUiaCheckboxActionHandler(aSynthuseConfigPanel, aConfig)); + aSynthuseConfigPanel.getDisableUiaBridgeCheckBox().addActionListener(disableUiaBridgeCheckboxActionHandler(aSynthuseConfigPanel, aConfig)); + aSynthuseConfigPanel.getRefreshKeyTextField().addActionListener(refreshKeyCodeTextFieldActionHandler(aSynthuseConfigPanel, aConfig)); + aSynthuseConfigPanel.getStrongTextMatchingCheckBox().addActionListener(strongTextMatchingCheckboxActionHandler(aSynthuseConfigPanel, aConfig)); + aSynthuseConfigPanel.getTargetKeyTextField().addActionListener(targetKeyCodeTextFieldActionHandler(aSynthuseConfigPanel, aConfig)); + aSynthuseConfigPanel.getXPathHighlightTextField().addActionListener(xpathHighlightTextFieldActionHandler(aSynthuseConfigPanel, aConfig)); + aSynthuseConfigPanel.getXPathListTextField().addActionListener(xpathListTextFieldActionHandler(aSynthuseConfigPanel, aConfig)); + } + + private static ActionListener xpathListTextFieldActionHandler(final SynthuseConfigPanel aSynthuseConfigPanel, + final Config aConfig) { + return new ActionListener() { + @Override + public void actionPerformed(ActionEvent aE) { + aConfig.setXPathList(aSynthuseConfigPanel.getXPathListTextField().getText()); + } + }; + } + + private static ActionListener xpathHighlightTextFieldActionHandler(final SynthuseConfigPanel aSynthuseConfigPanel, + final Config aConfig) { + return new ActionListener() { + @Override + public void actionPerformed(ActionEvent aE) { + aConfig.setXPathHighlight(aSynthuseConfigPanel.getXPathHighlightTextField().getText()); + } + }; + } + + private static ActionListener targetKeyCodeTextFieldActionHandler(final SynthuseConfigPanel aSynthuseConfigPanel, + final Config aConfig) { + return new ActionListener() { + @Override + public void actionPerformed(ActionEvent aE) { + aConfig.setTargetKeyCode(aSynthuseConfigPanel.getTargetKeyTextField().getText()); + } + }; + } + + private static ActionListener strongTextMatchingCheckboxActionHandler( + final SynthuseConfigPanel aSynthuseConfigPanel, final Config aConfig) { + return new ActionListener() { + @Override + public void actionPerformed(ActionEvent aE) { + aConfig.setUseStrongTextMatching(aSynthuseConfigPanel.getStrongTextMatchingCheckBox().isSelected()); + } + }; + } + + private static ActionListener refreshKeyCodeTextFieldActionHandler(final SynthuseConfigPanel aSynthuseConfigPanel, + final Config aConfig) { + return new ActionListener() { + @Override + public void actionPerformed(ActionEvent aE) { + aConfig.setRefreshKeyCode(aSynthuseConfigPanel.getRefreshKeyTextField().getText()); + } + }; + } + + private static ActionListener disableUiaBridgeCheckboxActionHandler(final SynthuseConfigPanel aSynthuseConfigPanel, + final Config aConfig) { + return new ActionListener() { + @Override + public void actionPerformed(ActionEvent aE) { + aConfig.setDisableUiaBridge(aSynthuseConfigPanel.getDisableUiaBridgeCheckBox().isSelected()); + } + }; + } + + private static ActionListener disableFiltersUiaCheckboxActionHandler(final SynthuseConfigPanel aSynthuseConfigPanel, + final Config aConfig) { + return new ActionListener() { + @Override + public void actionPerformed(ActionEvent aE) { + aConfig.setDisableFiltersUia(aSynthuseConfigPanel.getDisableFiltersUiaCheckBox().isSelected()); + } + }; + } + + private static ActionListener alwaysOnTopCheckboxActionHandler(final SynthuseConfigPanel aSynthuseConfigPanel, + final Config aConfig) { + return new ActionListener() { + @Override + public void actionPerformed(ActionEvent aE) { + aConfig.setAlwaysOnTop(aSynthuseConfigPanel.getAlwaysOnTopCheckBox().isSelected()); + } + }; + } } From 6e2df271ecc70459de585ef9472dc86f726c07c4 Mon Sep 17 00:00:00 2001 From: Alex Kogon Date: Tue, 15 Sep 2015 12:28:36 +0200 Subject: [PATCH 12/14] Add option pane to reflect that existing properties may not be updated until restart --- .../controllers/SynthuseConfigDialogControllers.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/org/synthuse/controllers/SynthuseConfigDialogControllers.java b/src/org/synthuse/controllers/SynthuseConfigDialogControllers.java index 4b556dc..da619b3 100755 --- a/src/org/synthuse/controllers/SynthuseConfigDialogControllers.java +++ b/src/org/synthuse/controllers/SynthuseConfigDialogControllers.java @@ -3,6 +3,8 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import javax.swing.JOptionPane; + import org.synthuse.Config; import org.synthuse.views.SynthuseConfigPanel; @@ -36,6 +38,7 @@ private static ActionListener xpathListTextFieldActionHandler(final SynthuseConf @Override public void actionPerformed(ActionEvent aE) { aConfig.setXPathList(aSynthuseConfigPanel.getXPathListTextField().getText()); + JOptionPane.showMessageDialog(aSynthuseConfigPanel, "May require restart to be effective"); } }; } @@ -46,6 +49,7 @@ private static ActionListener xpathHighlightTextFieldActionHandler(final Synthus @Override public void actionPerformed(ActionEvent aE) { aConfig.setXPathHighlight(aSynthuseConfigPanel.getXPathHighlightTextField().getText()); + JOptionPane.showMessageDialog(aSynthuseConfigPanel, "May require restart to be effective"); } }; } @@ -56,6 +60,7 @@ private static ActionListener targetKeyCodeTextFieldActionHandler(final Synthuse @Override public void actionPerformed(ActionEvent aE) { aConfig.setTargetKeyCode(aSynthuseConfigPanel.getTargetKeyTextField().getText()); + JOptionPane.showMessageDialog(aSynthuseConfigPanel, "May require restart to be effective"); } }; } @@ -76,6 +81,7 @@ private static ActionListener refreshKeyCodeTextFieldActionHandler(final Synthus @Override public void actionPerformed(ActionEvent aE) { aConfig.setRefreshKeyCode(aSynthuseConfigPanel.getRefreshKeyTextField().getText()); + JOptionPane.showMessageDialog(aSynthuseConfigPanel, "May require restart to be effective"); } }; } @@ -86,6 +92,7 @@ private static ActionListener disableUiaBridgeCheckboxActionHandler(final Synthu @Override public void actionPerformed(ActionEvent aE) { aConfig.setDisableUiaBridge(aSynthuseConfigPanel.getDisableUiaBridgeCheckBox().isSelected()); + JOptionPane.showMessageDialog(aSynthuseConfigPanel, "May require restart to be effective"); } }; } @@ -96,6 +103,7 @@ private static ActionListener disableFiltersUiaCheckboxActionHandler(final Synth @Override public void actionPerformed(ActionEvent aE) { aConfig.setDisableFiltersUia(aSynthuseConfigPanel.getDisableFiltersUiaCheckBox().isSelected()); + JOptionPane.showMessageDialog(aSynthuseConfigPanel, "May require restart to be effective"); } }; } @@ -106,6 +114,7 @@ private static ActionListener alwaysOnTopCheckboxActionHandler(final SynthuseCon @Override public void actionPerformed(ActionEvent aE) { aConfig.setAlwaysOnTop(aSynthuseConfigPanel.getAlwaysOnTopCheckBox().isSelected()); + JOptionPane.showMessageDialog(aSynthuseConfigPanel, "May require restart to be effective"); } }; } From c5b7694372fd816b4907cf586cb543e6ce1ac170 Mon Sep 17 00:00:00 2001 From: Alex Kogon Date: Tue, 15 Sep 2015 12:37:30 +0200 Subject: [PATCH 13/14] added strut to config panel view for text boxes at end --- .../synthuse/views/SynthuseConfigPanel.java | 444 +++++++++--------- 1 file changed, 225 insertions(+), 219 deletions(-) diff --git a/src/org/synthuse/views/SynthuseConfigPanel.java b/src/org/synthuse/views/SynthuseConfigPanel.java index 81474ef..1092368 100755 --- a/src/org/synthuse/views/SynthuseConfigPanel.java +++ b/src/org/synthuse/views/SynthuseConfigPanel.java @@ -1,219 +1,225 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ -package org.synthuse.views; - -import javax.swing.JCheckBox; -import javax.swing.JTextField; - -/** - * - * @author ux29sy - */ -public class SynthuseConfigPanel extends javax.swing.JPanel { - - /** - * Creates new form SynthuseConfigPanel - */ - public SynthuseConfigPanel() { - initComponents(); - } - - /** - * This method is called from within the constructor to initialize the form. - * WARNING: Do NOT modify this code. The content of this method is always - * regenerated by the Form Editor. - */ - @SuppressWarnings("unchecked") - // - private void initComponents() { - java.awt.GridBagConstraints gridBagConstraints; - - theStrongTextMatchingCheckBox = new javax.swing.JCheckBox(); - theAlwaysOnTopCheckBox = new javax.swing.JCheckBox(); - theDisableUiaBridgeCheckBox = new javax.swing.JCheckBox(); - theDisableFiltersUiaCheckBox = new javax.swing.JCheckBox(); - jLabel1 = new javax.swing.JLabel(); - jLabel2 = new javax.swing.JLabel(); - jLabel3 = new javax.swing.JLabel(); - jLabel4 = new javax.swing.JLabel(); - filler1 = new javax.swing.Box.Filler(new java.awt.Dimension(0, 20), new java.awt.Dimension(0, 20), new java.awt.Dimension(0, 32767)); - filler2 = new javax.swing.Box.Filler(new java.awt.Dimension(90, 0), new java.awt.Dimension(90, 0), new java.awt.Dimension(32767, 0)); - theRefreshKeyTextField = new javax.swing.JTextField(); - theTargetKeyTextField = new javax.swing.JTextField(); - theXPathListTextField = new javax.swing.JTextField(); - theXPathHighlightTextField = new javax.swing.JTextField(); - - setLayout(new java.awt.GridBagLayout()); - - theStrongTextMatchingCheckBox.setText("Use Strong Text Matching"); - theStrongTextMatchingCheckBox.setHorizontalTextPosition(javax.swing.SwingConstants.LEADING); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 0; - gridBagConstraints.gridwidth = 2; - gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; - gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); - add(theStrongTextMatchingCheckBox, gridBagConstraints); - - theAlwaysOnTopCheckBox.setText("Always On Top"); - theAlwaysOnTopCheckBox.setHorizontalTextPosition(javax.swing.SwingConstants.LEADING); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 1; - gridBagConstraints.gridwidth = 2; - gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; - gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); - add(theAlwaysOnTopCheckBox, gridBagConstraints); - - theDisableUiaBridgeCheckBox.setText("Disable Uia Bridge"); - theDisableUiaBridgeCheckBox.setHorizontalTextPosition(javax.swing.SwingConstants.LEADING); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 2; - gridBagConstraints.gridwidth = 2; - gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; - gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); - add(theDisableUiaBridgeCheckBox, gridBagConstraints); - - theDisableFiltersUiaCheckBox.setText("Disable Filters Uia"); - theDisableFiltersUiaCheckBox.setHorizontalTextPosition(javax.swing.SwingConstants.LEADING); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 3; - gridBagConstraints.gridwidth = 2; - gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; - gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); - add(theDisableFiltersUiaCheckBox, gridBagConstraints); - - jLabel1.setText("Refresh Key:"); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 4; - gridBagConstraints.gridy = 0; - gridBagConstraints.gridheight = 2; - gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; - gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); - add(jLabel1, gridBagConstraints); - - jLabel2.setText("Target Key:"); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 4; - gridBagConstraints.gridy = 2; - gridBagConstraints.gridheight = 2; - gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; - gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); - add(jLabel2, gridBagConstraints); - - jLabel3.setText("XPath List:"); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 5; - gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; - gridBagConstraints.insets = new java.awt.Insets(6, 6, 6, 6); - add(jLabel3, gridBagConstraints); - - jLabel4.setText("XPath Highlight:"); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 6; - gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; - gridBagConstraints.insets = new java.awt.Insets(6, 6, 6, 6); - add(jLabel4, gridBagConstraints); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 4; - add(filler1, gridBagConstraints); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 2; - gridBagConstraints.gridy = 0; - add(filler2, gridBagConstraints); - - theRefreshKeyTextField.setText("XXXX"); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 5; - gridBagConstraints.gridy = 0; - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.gridheight = 2; - gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; - add(theRefreshKeyTextField, gridBagConstraints); - - theTargetKeyTextField.setText("XXXX"); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 5; - gridBagConstraints.gridy = 2; - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.gridheight = 2; - gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; - add(theTargetKeyTextField, gridBagConstraints); - - theXPathListTextField.setText("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 1; - gridBagConstraints.gridy = 5; - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; - gridBagConstraints.insets = new java.awt.Insets(6, 6, 6, 6); - add(theXPathListTextField, gridBagConstraints); - - theXPathHighlightTextField.setText("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 1; - gridBagConstraints.gridy = 6; - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; - gridBagConstraints.insets = new java.awt.Insets(6, 6, 6, 6); - add(theXPathHighlightTextField, gridBagConstraints); - }// - - - // Variables declaration - do not modify - private javax.swing.Box.Filler filler1; - private javax.swing.Box.Filler filler2; - private javax.swing.JLabel jLabel1; - private javax.swing.JLabel jLabel2; - private javax.swing.JLabel jLabel3; - private javax.swing.JLabel jLabel4; - private javax.swing.JCheckBox theAlwaysOnTopCheckBox; - private javax.swing.JCheckBox theDisableFiltersUiaCheckBox; - private javax.swing.JCheckBox theDisableUiaBridgeCheckBox; - private javax.swing.JTextField theRefreshKeyTextField; - private javax.swing.JCheckBox theStrongTextMatchingCheckBox; - private javax.swing.JTextField theTargetKeyTextField; - private javax.swing.JTextField theXPathHighlightTextField; - private javax.swing.JTextField theXPathListTextField; - // End of variables declaration - - public JCheckBox getAlwaysOnTopCheckBox() { - return theAlwaysOnTopCheckBox; - } - - public JCheckBox getDisableFiltersUiaCheckBox() { - return theDisableFiltersUiaCheckBox; - } - - public JCheckBox getDisableUiaBridgeCheckBox() { - return theDisableUiaBridgeCheckBox; - } - - public JTextField getRefreshKeyTextField() { - return theRefreshKeyTextField; - } - - public JCheckBox getStrongTextMatchingCheckBox() { - return theStrongTextMatchingCheckBox; - } - - public JTextField getTargetKeyTextField() { - return theTargetKeyTextField; - } - - public JTextField getXPathHighlightTextField() { - return theXPathHighlightTextField; - } - - public JTextField getXPathListTextField() { - return theXPathListTextField; - } -} +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.synthuse.views; + +import javax.swing.JCheckBox; +import javax.swing.JTextField; + +/** + * + * @author ux29sy + */ +public class SynthuseConfigPanel extends javax.swing.JPanel { + + /** + * Creates new form SynthuseConfigPanel + */ + public SynthuseConfigPanel() { + initComponents(); + } + + /** + * This method is called from within the constructor to initialize the form. + * WARNING: Do NOT modify this code. The content of this method is always + * regenerated by the Form Editor. + */ + @SuppressWarnings("unchecked") + // //GEN-BEGIN:initComponents + private void initComponents() { + java.awt.GridBagConstraints gridBagConstraints; + + theStrongTextMatchingCheckBox = new javax.swing.JCheckBox(); + theAlwaysOnTopCheckBox = new javax.swing.JCheckBox(); + theDisableUiaBridgeCheckBox = new javax.swing.JCheckBox(); + theDisableFiltersUiaCheckBox = new javax.swing.JCheckBox(); + jLabel1 = new javax.swing.JLabel(); + jLabel2 = new javax.swing.JLabel(); + jLabel3 = new javax.swing.JLabel(); + jLabel4 = new javax.swing.JLabel(); + filler1 = new javax.swing.Box.Filler(new java.awt.Dimension(0, 20), new java.awt.Dimension(0, 20), new java.awt.Dimension(0, 32767)); + filler2 = new javax.swing.Box.Filler(new java.awt.Dimension(90, 0), new java.awt.Dimension(90, 0), new java.awt.Dimension(32767, 0)); + theRefreshKeyTextField = new javax.swing.JTextField(); + theTargetKeyTextField = new javax.swing.JTextField(); + theXPathListTextField = new javax.swing.JTextField(); + theXPathHighlightTextField = new javax.swing.JTextField(); + filler3 = new javax.swing.Box.Filler(new java.awt.Dimension(50, 0), new java.awt.Dimension(50, 0), new java.awt.Dimension(50, 32767)); + + setLayout(new java.awt.GridBagLayout()); + + theStrongTextMatchingCheckBox.setText("Use Strong Text Matching"); + theStrongTextMatchingCheckBox.setHorizontalTextPosition(javax.swing.SwingConstants.LEADING); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 0; + gridBagConstraints.gridwidth = 2; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); + add(theStrongTextMatchingCheckBox, gridBagConstraints); + + theAlwaysOnTopCheckBox.setText("Always On Top"); + theAlwaysOnTopCheckBox.setHorizontalTextPosition(javax.swing.SwingConstants.LEADING); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 1; + gridBagConstraints.gridwidth = 2; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); + add(theAlwaysOnTopCheckBox, gridBagConstraints); + + theDisableUiaBridgeCheckBox.setText("Disable Uia Bridge"); + theDisableUiaBridgeCheckBox.setHorizontalTextPosition(javax.swing.SwingConstants.LEADING); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 2; + gridBagConstraints.gridwidth = 2; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); + add(theDisableUiaBridgeCheckBox, gridBagConstraints); + + theDisableFiltersUiaCheckBox.setText("Disable Filters Uia"); + theDisableFiltersUiaCheckBox.setHorizontalTextPosition(javax.swing.SwingConstants.LEADING); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 3; + gridBagConstraints.gridwidth = 2; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); + add(theDisableFiltersUiaCheckBox, gridBagConstraints); + + jLabel1.setText("Refresh Key:"); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 4; + gridBagConstraints.gridy = 0; + gridBagConstraints.gridheight = 2; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); + add(jLabel1, gridBagConstraints); + + jLabel2.setText("Target Key:"); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 4; + gridBagConstraints.gridy = 2; + gridBagConstraints.gridheight = 2; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3); + add(jLabel2, gridBagConstraints); + + jLabel3.setText("XPath List:"); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 5; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.insets = new java.awt.Insets(6, 6, 6, 6); + add(jLabel3, gridBagConstraints); + + jLabel4.setText("XPath Highlight:"); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 6; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.insets = new java.awt.Insets(6, 6, 6, 6); + add(jLabel4, gridBagConstraints); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 4; + add(filler1, gridBagConstraints); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 2; + gridBagConstraints.gridy = 0; + add(filler2, gridBagConstraints); + + theRefreshKeyTextField.setText("XXXX"); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 5; + gridBagConstraints.gridy = 0; + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.gridheight = 2; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + add(theRefreshKeyTextField, gridBagConstraints); + + theTargetKeyTextField.setText("XXXX"); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 5; + gridBagConstraints.gridy = 2; + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.gridheight = 2; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + add(theTargetKeyTextField, gridBagConstraints); + + theXPathListTextField.setText("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 1; + gridBagConstraints.gridy = 5; + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.insets = new java.awt.Insets(6, 6, 6, 6); + add(theXPathListTextField, gridBagConstraints); + + theXPathHighlightTextField.setText("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 1; + gridBagConstraints.gridy = 6; + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.insets = new java.awt.Insets(6, 6, 6, 6); + add(theXPathHighlightTextField, gridBagConstraints); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 5; + gridBagConstraints.gridy = 4; + add(filler3, gridBagConstraints); + }// //GEN-END:initComponents + + + // Variables declaration - do not modify//GEN-BEGIN:variables + private javax.swing.Box.Filler filler1; + private javax.swing.Box.Filler filler2; + private javax.swing.Box.Filler filler3; + private javax.swing.JLabel jLabel1; + private javax.swing.JLabel jLabel2; + private javax.swing.JLabel jLabel3; + private javax.swing.JLabel jLabel4; + private javax.swing.JCheckBox theAlwaysOnTopCheckBox; + private javax.swing.JCheckBox theDisableFiltersUiaCheckBox; + private javax.swing.JCheckBox theDisableUiaBridgeCheckBox; + private javax.swing.JTextField theRefreshKeyTextField; + private javax.swing.JCheckBox theStrongTextMatchingCheckBox; + private javax.swing.JTextField theTargetKeyTextField; + private javax.swing.JTextField theXPathHighlightTextField; + private javax.swing.JTextField theXPathListTextField; + // End of variables declaration//GEN-END:variables + + public JCheckBox getAlwaysOnTopCheckBox() { + return theAlwaysOnTopCheckBox; + } + + public JCheckBox getDisableFiltersUiaCheckBox() { + return theDisableFiltersUiaCheckBox; + } + + public JCheckBox getDisableUiaBridgeCheckBox() { + return theDisableUiaBridgeCheckBox; + } + + public JTextField getRefreshKeyTextField() { + return theRefreshKeyTextField; + } + + public JCheckBox getStrongTextMatchingCheckBox() { + return theStrongTextMatchingCheckBox; + } + + public JTextField getTargetKeyTextField() { + return theTargetKeyTextField; + } + + public JTextField getXPathHighlightTextField() { + return theXPathHighlightTextField; + } + + public JTextField getXPathListTextField() { + return theXPathListTextField; + } +} From 36e6f0327ef316f320857851be600d2cd65a9891 Mon Sep 17 00:00:00 2001 From: Alex Kogon Date: Tue, 22 Sep 2015 12:06:22 +0200 Subject: [PATCH 14/14] made new config public so serializer works --- src/org/synthuse/Config.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/synthuse/Config.java b/src/org/synthuse/Config.java index eac3346..953582e 100644 --- a/src/org/synthuse/Config.java +++ b/src/org/synthuse/Config.java @@ -20,7 +20,7 @@ public class Config extends PropertiesSerializer { public String xpathList = ""; public String xpathHightlight = ".*process=\"([^\"]*)\".*"; - private boolean useStrongTextMatching = false; + public boolean useStrongTextMatching = false; public Config() //needed for cloning