diff --git a/src/main/java/burp/BurpExtender.java b/src/main/java/burp/BurpExtender.java index 9c100f1..0b4110d 100644 --- a/src/main/java/burp/BurpExtender.java +++ b/src/main/java/burp/BurpExtender.java @@ -32,7 +32,7 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito this.callbacks = callbacks; BurpExtender.helpers = callbacks.getHelpers(); - String version = "2.2.2"; + String version = "2.2.3"; callbacks.setExtensionName(String.format("HaE (%s) - Highlighter and Extractor", version)); // 定义输出 stdout = new PrintWriter(callbacks.getStdout(), true); @@ -159,7 +159,10 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito for (int row : selectRows) { selectData.append(jTable.getValueAt(row, 0).toString()).append("\n"); } - return helpers.stringToBytes(selectData.toString()); + // 便于单行复制，去除最后一个换行符 + String revData = selectData.reverse().toString().replaceFirst("\n", ""); + StringBuilder retData = new StringBuilder(revData).reverse(); + return helpers.stringToBytes(retData.toString()); } /** diff --git a/src/main/java/burp/Config.java b/src/main/java/burp/Config.java index 846c70d..ab6ea6c 100644 --- a/src/main/java/burp/Config.java +++ b/src/main/java/burp/Config.java @@ -4,7 +4,6 @@ package burp; * @author EvilChen */ -import burp.yaml.LoadConfig; import java.util.Map; public class Config { @@ -25,7 +24,6 @@ public class Config { "dfa" }; - public static String[] colorArray = new String[] { "red", "orange", diff --git a/src/main/java/burp/ui/MainUI.java b/src/main/java/burp/ui/MainUI.java index c9f9b9f..61ae91e 100644 --- a/src/main/java/burp/ui/MainUI.java +++ b/src/main/java/burp/ui/MainUI.java @@ -24,23 +24,24 @@ public class MainUI extends JPanel{ public MainUI() { initComponents(); } + public void closeTabActionPerformed(ActionEvent e){ - if (tabbedPane1.getTabCount()>2){ - if (tabbedPane1.getSelectedIndex()!=0){ + if (ruleTabbedPane.getTabCount()>2){ + if (ruleTabbedPane.getSelectedIndex()!=0){ SetConfig setConn = new SetConfig(); - setConn.deleteRules(tabbedPane1.getTitleAt(tabbedPane1.getSelectedIndex())); - tabbedPane1.remove(tabbedPane1.getSelectedIndex()); - tabbedPane1.setSelectedIndex(tabbedPane1.getSelectedIndex()-1); + setConn.deleteRules(ruleTabbedPane.getTitleAt(ruleTabbedPane.getSelectedIndex())); + ruleTabbedPane.remove(ruleTabbedPane.getSelectedIndex()); + ruleTabbedPane.setSelectedIndex(ruleTabbedPane.getSelectedIndex()-1); }else{ SetConfig setConn = new SetConfig(); - setConn.deleteRules(tabbedPane1.getTitleAt(tabbedPane1.getSelectedIndex())); - tabbedPane1.remove(tabbedPane1.getSelectedIndex()); - tabbedPane1.setSelectedIndex(tabbedPane1.getSelectedIndex()); + setConn.deleteRules(ruleTabbedPane.getTitleAt(ruleTabbedPane.getSelectedIndex())); + ruleTabbedPane.remove(ruleTabbedPane.getSelectedIndex()); + ruleTabbedPane.setSelectedIndex(ruleTabbedPane.getSelectedIndex()); } } } - private void SelectFileMouseClicked(MouseEvent e) { + private void selectFileMouseClicked(MouseEvent e) { JFileChooser selectFile = new JFileChooser(); selectFile.setFileSelectionMode(JFileChooser.FILES_ONLY); FileNameExtensionFilter filter = new FileNameExtensionFilter("Yaml File (.yml/.yaml)","yaml", "yml"); @@ -50,21 +51,22 @@ public class MainUI extends JPanel{ String configPath = selectFile.getSelectedFile().toString(); reloadRule(); loadConn.setConfigPath(configPath); - configFilepathtext.setText(configPath); + configTextField.setText(configPath); } + new LoadConfig(); } private void reloadRule(){ - tabbedPane1.removeAll(); + ruleTabbedPane.removeAll(); ruleSwitch.setListen(false); Map rules = LoadConfig.getRules(); rules.keySet().forEach( - i->tabbedPane1.addTab( + i-> ruleTabbedPane.addTab( i, - new RulePane(rules.get(i), tabbedPane1) + new RulePane(rules.get(i), ruleTabbedPane) ) ); - tabbedPane1.addTab("...", new JLabel()); + ruleTabbedPane.addTab("...", new JLabel()); ruleSwitch.setListen(true); } @@ -72,205 +74,199 @@ public class MainUI extends JPanel{ reloadRule(); } - private void ESSaveMouseClicked(MouseEvent e) { + private void excludeSuffixSaveMouseClicked(MouseEvent e) { LoadConfig loadCon = new LoadConfig(); - loadCon.setExcludeSuffix(EStext.getText()); + loadCon.setExcludeSuffix(excludeSuffixTextField.getText()); } private void initComponents() { - tabbedPane2 = new JTabbedPane(); - tabbedPane1 = new JTabbedPane(); - panel3 = new JPanel(); - configFilepathtext = new JTextField(); - label1 = new JLabel(); - SelectFile = new JButton(); - reload = new JButton(); - label2 = new JLabel(); - EStext = new JTextField(); - ESSave = new JButton(); + rulesTabbedPane = new JTabbedPane(); + ruleTabbedPane = new JTabbedPane(); + rulePanel = new JPanel(); + configTextField = new JTextField(); + configLabel = new JLabel(); + selectFileButton = new JButton(); + reloadButton = new JButton(); + excludeSuffixLabel = new JLabel(); + excludeSuffixTextField = new JTextField(); + excludeSuffixSaveButton = new JButton(); - //======== this ======== setLayout(new GridBagLayout()); ((GridBagLayout)getLayout()).columnWidths = new int[] {0, 0}; ((GridBagLayout)getLayout()).rowHeights = new int[] {0, 0}; ((GridBagLayout)getLayout()).columnWeights = new double[] {1.0, 1.0E-4}; ((GridBagLayout)getLayout()).rowWeights = new double[] {1.0, 1.0E-4}; - //======== tabbedPane2 ======== { - tabbedPane2.addTab("Rules", tabbedPane1); + rulesTabbedPane.addTab("Rules", ruleTabbedPane); - //======== panel3 ======== { - panel3.setLayout(new GridBagLayout()); - ((GridBagLayout)panel3.getLayout()).columnWidths = new int[] {0, 0, 0, 0, 0}; - ((GridBagLayout)panel3.getLayout()).rowHeights = new int[] {0, 0, 0}; - ((GridBagLayout)panel3.getLayout()).columnWeights = new double[] {0.0, 1.0, 0.0, 0.0, 1.0E-4}; - ((GridBagLayout)panel3.getLayout()).rowWeights = new double[] {0.0, 0.0, 1.0E-4}; + rulePanel.setLayout(new GridBagLayout()); + ((GridBagLayout) rulePanel.getLayout()).columnWidths = new int[] {0, 0, 0, 0, 0}; + ((GridBagLayout) rulePanel.getLayout()).rowHeights = new int[] {0, 0, 0}; + ((GridBagLayout) rulePanel.getLayout()).columnWeights = new double[] {0.0, 1.0, 0.0, 0.0, 1.0E-4}; + ((GridBagLayout) rulePanel.getLayout()).rowWeights = new double[] {0.0, 0.0, 1.0E-4}; - //---- configFilepathtext ---- - configFilepathtext.setEditable(false); - panel3.add(configFilepathtext, new GridBagConstraints(1, 0, 1, 1, 0.0, 0.0, + configTextField.setEditable(false); + rulePanel.add(configTextField, new GridBagConstraints(1, 0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(5, 0, 5, 5), 0, 0)); - //---- label1 ---- - label1.setText("Config File Path:"); - panel3.add(label1, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, + configLabel.setText("Config File Path:"); + rulePanel.add(configLabel, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.VERTICAL, new Insets(5, 5, 5, 5), 0, 0)); - //---- SelectFile ---- - SelectFile.setText("Select File ..."); - SelectFile.addMouseListener(new MouseAdapter() { + selectFileButton.setText("Select File ..."); + selectFileButton.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent e) { - SelectFileMouseClicked(e); + selectFileMouseClicked(e); } }); - panel3.add(SelectFile, new GridBagConstraints(2, 0, 1, 1, 0.0, 0.0, + rulePanel.add(selectFileButton, new GridBagConstraints(2, 0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(5, 0, 5, 5), 0, 0)); - //---- reload ---- - reload.setText("Reload"); - reload.addMouseListener(new MouseAdapter() { + reloadButton.setText("Reload"); + reloadButton.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent e) { reloadMouseClicked(e); } }); - panel3.add(reload, new GridBagConstraints(3, 0, 1, 1, 0.0, 0.0, + rulePanel.add(reloadButton, new GridBagConstraints(3, 0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(5, 0, 5, 5), 0, 0)); -//---- label2 ---- - label2.setText("ExcludeSuffix:"); - panel3.add(label2, new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0, + + excludeSuffixLabel.setText("ExcludeSuffix:"); + rulePanel.add(excludeSuffixLabel, new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0, GridBagConstraints.SOUTHWEST, GridBagConstraints.NONE, new Insets(0, 5, 5, 5), 0, 0)); - panel3.add(EStext, new GridBagConstraints(1, 1, 1, 1, 0.0, 0.0, + rulePanel.add(excludeSuffixTextField, new GridBagConstraints(1, 1, 1, 1, 0.0, 0.0, GridBagConstraints.SOUTH, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 5), 0, 0)); - //---- ESSave ---- - ESSave.setText("Save"); - ESSave.addMouseListener(new MouseAdapter() { + excludeSuffixSaveButton.setText("Save"); + excludeSuffixSaveButton.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent e) { - ESSaveMouseClicked(e); + excludeSuffixSaveMouseClicked(e); } }); - panel3.add(ESSave, new GridBagConstraints(2, 1, 1, 1, 0.0, 0.0, + rulePanel.add(excludeSuffixSaveButton, new GridBagConstraints(2, 1, 1, 1, 0.0, 0.0, GridBagConstraints.SOUTH, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 5), 0, 0)); } - tabbedPane2.addTab("Config", panel3); + rulesTabbedPane.addTab("Config", rulePanel); } - add(tabbedPane2, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, + add(rulesTabbedPane, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0)); - // JFormDesigner - End of component initialization //GEN-END:initComponents - Config.ruleConfig.keySet().forEach(i->tabbedPane1.addTab(i,new RulePane(Config.ruleConfig.get(i),tabbedPane1))); + Config.ruleConfig.keySet().forEach(i-> ruleTabbedPane.addTab(i,new RulePane(Config.ruleConfig.get(i), + ruleTabbedPane))); - tabbedPane1.addTab("...",new JLabel()); + ruleTabbedPane.addTab("...",new JLabel()); - //TabTitleEditListener ruleSwitch = new TabTitleEditListener(tabbedPane1); - configFilepathtext.setText(LoadConfig.getConfigPath()); - EStext.setText(loadConn.getExcludeSuffix()); - ruleSwitch = new TabTitleEditListener(tabbedPane1); - tabbedPane1.addChangeListener(ruleSwitch); - tabbedPane1.addMouseListener(ruleSwitch); - closeTab.addActionListener(e -> closeTabActionPerformed(e)); - tabMenu.add(closeTab); + configTextField.setText(LoadConfig.getConfigPath()); + excludeSuffixTextField.setText(loadConn.getExcludeSuffix()); + ruleSwitch = new TabTitleEditListener(ruleTabbedPane); + ruleTabbedPane.addChangeListener(ruleSwitch); + ruleTabbedPane.addMouseListener(ruleSwitch); + closeTabMenuItem.addActionListener(e -> closeTabActionPerformed(e)); + tabMenu.add(closeTabMenuItem); } - // JFormDesigner - Variables declaration - DO NOT MODIFY //GEN-BEGIN:variables - private JTabbedPane tabbedPane2; - private JTabbedPane tabbedPane1; - private JPanel panel3; - private JTextField configFilepathtext; - private JLabel label1; - private JButton SelectFile; - private JButton reload; - private JLabel label2; - private JTextField EStext; - private JButton ESSave; - // JFormDesigner - End of variables declaration //GEN-END:variables + private JTabbedPane rulesTabbedPane; + private JTabbedPane ruleTabbedPane; + private JPanel rulePanel; + private JTextField configTextField; + private JLabel configLabel; + private JButton selectFileButton; + private JButton reloadButton; + private JLabel excludeSuffixLabel; + private JTextField excludeSuffixTextField; + private JButton excludeSuffixSaveButton; + protected static JPopupMenu tabMenu = new JPopupMenu(); - private JMenuItem closeTab = new JMenuItem("Delete"); + private JMenuItem closeTabMenuItem = new JMenuItem("Delete"); private TabTitleEditListener ruleSwitch; } class TabTitleEditListener extends MouseAdapter implements ChangeListener, DocumentListener { - protected final JTextField editor = new JTextField(); - protected final JTabbedPane tabbedPane; - protected int editingIdx = -1; + protected final JTextField ruleEditTextField = new JTextField(); + protected final JTabbedPane ruleEditTabbedPane; + protected int editingIndex = -1; protected int len = -1; protected Boolean listen = true; protected Dimension dim; protected Component tabComponent; protected Boolean isRenameOk = false; protected SetConfig setConfig = new SetConfig(); + protected final Action startEditing = new AbstractAction() { @Override public void actionPerformed(ActionEvent e) { - editingIdx = tabbedPane.getSelectedIndex(); - tabComponent = tabbedPane.getTabComponentAt(editingIdx); - tabbedPane.setTabComponentAt(editingIdx, editor); + editingIndex = ruleEditTabbedPane.getSelectedIndex(); + tabComponent = ruleEditTabbedPane.getTabComponentAt(editingIndex); + ruleEditTabbedPane.setTabComponentAt(editingIndex, ruleEditTextField); isRenameOk = true; - editor.setVisible(true); - editor.setText(tabbedPane.getTitleAt(editingIdx)); - editor.selectAll(); - editor.requestFocusInWindow(); - len = editor.getText().length(); - dim = editor.getPreferredSize(); - editor.setMinimumSize(dim); + ruleEditTextField.setVisible(true); + ruleEditTextField.setText(ruleEditTabbedPane.getTitleAt(editingIndex)); + ruleEditTextField.selectAll(); + ruleEditTextField.requestFocusInWindow(); + len = ruleEditTextField.getText().length(); + dim = ruleEditTextField.getPreferredSize(); + ruleEditTextField.setMinimumSize(dim); } }; + protected final Action renameTabTitle = new AbstractAction() { @Override public void actionPerformed(ActionEvent e) { - String title = editor.getText().trim(); - if (editingIdx >= 0 && !title.isEmpty()) { - String oldName = tabbedPane.getTitleAt(editingIdx); - tabbedPane.setTitleAt(editingIdx, title); + String title = ruleEditTextField.getText().trim(); + if (editingIndex >= 0 && !title.isEmpty()) { + String oldName = ruleEditTabbedPane.getTitleAt(editingIndex); + ruleEditTabbedPane.setTitleAt(editingIndex, title); setConfig.rename(oldName,title); } cancelEditing.actionPerformed(null); } }; + protected final Action cancelEditing = new AbstractAction() { @Override public void actionPerformed(ActionEvent e) { - if (editingIdx >= 0) { - tabbedPane.setTabComponentAt(editingIdx, tabComponent); - editor.setVisible(false); - editingIdx = -1; + if (editingIndex >= 0) { + ruleEditTabbedPane.setTabComponentAt(editingIndex, tabComponent); + ruleEditTextField.setVisible(false); + editingIndex = -1; len = -1; tabComponent = null; - editor.setPreferredSize(null); - tabbedPane.requestFocusInWindow(); + ruleEditTextField.setPreferredSize(null); + ruleEditTabbedPane.requestFocusInWindow(); } } }; protected TabTitleEditListener(JTabbedPane tabbedPane) { super(); - this.tabbedPane = tabbedPane; - editor.setBorder(BorderFactory.createEmptyBorder()); - editor.addFocusListener(new FocusAdapter() { + this.ruleEditTabbedPane = tabbedPane; + ruleEditTextField.setBorder(BorderFactory.createEmptyBorder()); + ruleEditTextField.addFocusListener(new FocusAdapter() { @Override public void focusLost(FocusEvent e) { renameTabTitle.actionPerformed(null); } }); - InputMap im = editor.getInputMap(JComponent.WHEN_FOCUSED); - ActionMap am = editor.getActionMap(); + InputMap im = ruleEditTextField.getInputMap(JComponent.WHEN_FOCUSED); + ActionMap am = ruleEditTextField.getActionMap(); im.put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), "cancel-editing"); am.put("cancel-editing", cancelEditing); im.put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "rename-tab-title"); am.put("rename-tab-title", renameTabTitle); - editor.getDocument().addDocumentListener(this); + ruleEditTextField.getDocument().addDocumentListener(this); tabbedPane.getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "start-editing"); tabbedPane.getActionMap().put("start-editing", startEditing); } + @Override public void stateChanged(ChangeEvent e) { if (e.getSource() instanceof JTabbedPane && listen) { JTabbedPane pane = (JTabbedPane) e.getSource(); @@ -286,18 +282,22 @@ class TabTitleEditListener extends MouseAdapter implements ChangeListener, Docum } renameTabTitle.actionPerformed(null); } + public void newTab(){ Object[][] data = new Object[][]{{false, "New Name", "(New Regex)", "gray", "any", "nfa"}}; - insertTab(tabbedPane, setConfig.newRules(),data); + insertTab(ruleEditTabbedPane, setConfig.newRules(),data); } + public void insertTab(JTabbedPane pane,String title,Object[][] data){ pane.addTab(title,new RulePane(data,pane)); pane.remove(pane.getSelectedIndex()); pane.addTab("...",new JLabel()); } + public void setListen(Boolean listen){ this.listen = listen; } + @Override public void insertUpdate(DocumentEvent e) { updateTabSize(); } @@ -312,7 +312,7 @@ class TabTitleEditListener extends MouseAdapter implements ChangeListener, Docum switch (e.getButton()){ case 1: { - Rectangle r = tabbedPane.getBoundsAt(tabbedPane.getSelectedIndex()); + Rectangle r = ruleEditTabbedPane.getBoundsAt(ruleEditTabbedPane.getSelectedIndex()); boolean isDoubleClick = e.getClickCount() >= 2; if (isDoubleClick && r.contains(e.getPoint())) { startEditing.actionPerformed(null); @@ -331,7 +331,7 @@ class TabTitleEditListener extends MouseAdapter implements ChangeListener, Docum } protected void updateTabSize() { - editor.setPreferredSize(editor.getText().length() > len ? null : dim); - tabbedPane.revalidate(); + ruleEditTextField.setPreferredSize(ruleEditTextField.getText().length() > len ? null : dim); + ruleEditTabbedPane.revalidate(); } } \ No newline at end of file diff --git a/src/main/java/burp/ui/RulePane.java b/src/main/java/burp/ui/RulePane.java index 2ae6c5d..1e0894e 100644 --- a/src/main/java/burp/ui/RulePane.java +++ b/src/main/java/burp/ui/RulePane.java @@ -30,54 +30,54 @@ public class RulePane extends JPanel { Vector data = new Vector(); data.add(false); data.add(add.Name.getText()); - data.add(add.Regex.getText()); - data.add(add.ColorSelect.getSelectedItem().toString()); - data.add(add.ScopeSelect.getSelectedItem().toString()); - data.add(add.EngineSelect.getSelectedItem().toString()); + data.add(add.regexTextField.getText()); + data.add(add.colorComboBox.getSelectedItem().toString()); + data.add(add.scopeComboBox.getSelectedItem().toString()); + data.add(add.engineComboBox.getSelectedItem().toString()); model.insertRow(model.getRowCount(), data); - model = (DefaultTableModel) jTable.getModel(); + model = (DefaultTableModel) ruleTable.getModel(); setConfig.add(data, pane.getTitleAt(pane.getSelectedIndex())); } } private void ruleEditMouseClicked(MouseEvent e, JTabbedPane pane){ - if (jTable.getSelectedRowCount() >= 1){ + if (ruleTable.getSelectedRowCount() >= 1){ RuleSetting edit = new RuleSetting(); - edit.Name.setText(jTable.getValueAt(jTable.getSelectedRow(), 1).toString()); - edit.Regex.setText(jTable.getValueAt(jTable.getSelectedRow(), 2).toString()); - edit.ColorSelect.setSelectedItem(jTable.getValueAt(jTable.getSelectedRow(), 3).toString()); - edit.ScopeSelect.setSelectedItem(jTable.getValueAt(jTable.getSelectedRow(), 4).toString()); - edit.EngineSelect.setSelectedItem(jTable.getValueAt(jTable.getSelectedRow(), 5).toString()); + edit.Name.setText(ruleTable.getValueAt(ruleTable.getSelectedRow(), 1).toString()); + edit.regexTextField.setText(ruleTable.getValueAt(ruleTable.getSelectedRow(), 2).toString()); + edit.colorComboBox.setSelectedItem(ruleTable.getValueAt(ruleTable.getSelectedRow(), 3).toString()); + edit.scopeComboBox.setSelectedItem(ruleTable.getValueAt(ruleTable.getSelectedRow(), 4).toString()); + edit.engineComboBox.setSelectedItem(ruleTable.getValueAt(ruleTable.getSelectedRow(), 5).toString()); int isOk = JOptionPane.showConfirmDialog(null, edit, "RuleSetting - Edit Rule", JOptionPane.OK_OPTION); if (isOk == 0){ - int select = jTable.convertRowIndexToModel(jTable.getSelectedRow()); + int select = ruleTable.convertRowIndexToModel(ruleTable.getSelectedRow()); model.setValueAt(edit.Name.getText(), select, 1); - model.setValueAt(edit.Regex.getText(), select, 2); - model.setValueAt(edit.ColorSelect.getSelectedItem().toString(), select, 3); - model.setValueAt(edit.ScopeSelect.getSelectedItem().toString(), select, 4); - model.setValueAt(edit.EngineSelect.getSelectedItem().toString(), select, 5); - model = (DefaultTableModel) jTable.getModel(); + model.setValueAt(edit.regexTextField.getText(), select, 2); + model.setValueAt(edit.colorComboBox.getSelectedItem().toString(), select, 3); + model.setValueAt(edit.scopeComboBox.getSelectedItem().toString(), select, 4); + model.setValueAt(edit.engineComboBox.getSelectedItem().toString(), select, 5); + model = (DefaultTableModel) ruleTable.getModel(); setConfig.edit((Vector) model.getDataVector().get(select), select, pane.getTitleAt(pane.getSelectedIndex())); } } } private void ruleRemoveMouseClicked(MouseEvent e, JTabbedPane pane){ - if (jTable.getSelectedRowCount() >= 1){ + if (ruleTable.getSelectedRowCount() >= 1){ int isOk = JOptionPane.showConfirmDialog(null, "Are your sure?", "RuleSetting - Delete Rule", JOptionPane.OK_OPTION); if (isOk == 0){ - int select = jTable.convertRowIndexToModel(jTable.getSelectedRow()); + int select = ruleTable.convertRowIndexToModel(ruleTable.getSelectedRow()); model.removeRow(select); - model = (DefaultTableModel) jTable.getModel(); + model = (DefaultTableModel) ruleTable.getModel(); setConfig.remove(select, pane.getTitleAt(pane.getSelectedIndex())); } } } private void ruleTableChange(TableModelEvent e, JTabbedPane pane) { - if (e.getColumn() == 0 && jTable.getSelectedRow() != -1 && !isEdit){ - model = (DefaultTableModel) jTable.getModel(); - int select = jTable.convertRowIndexToModel(jTable.getSelectedRow()); + if (e.getColumn() == 0 && ruleTable.getSelectedRow() != -1 && !isEdit){ + model = (DefaultTableModel) ruleTable.getModel(); + int select = ruleTable.convertRowIndexToModel(ruleTable.getSelectedRow()); setConfig.edit((Vector) model.getDataVector().get(select), select, pane.getTitleAt(pane.getSelectedIndex())); } } @@ -87,7 +87,7 @@ public class RulePane extends JPanel { addButton = new JButton(); editButton = new JButton(); scrollPane = new JScrollPane(); - jTable = new JTable(); + ruleTable = new JTable(); removeButton = new JButton(); //======== this ======== @@ -105,7 +105,7 @@ public class RulePane extends JPanel { public void mouseClicked(MouseEvent e) { isEdit = true; ruleAddMouseClicked(e, pane); - model = (DefaultTableModel) jTable.getModel(); + model = (DefaultTableModel) ruleTable.getModel(); isEdit = false; } }); @@ -121,7 +121,7 @@ public class RulePane extends JPanel { public void mouseClicked(MouseEvent e) { isEdit = true; ruleEditMouseClicked(e, pane); - model = (DefaultTableModel) jTable.getModel(); + model = (DefaultTableModel) ruleTable.getModel(); isEdit = false; } }); @@ -133,13 +133,13 @@ public class RulePane extends JPanel { //======== scrollPane ======== { //---- table ---- - jTable.setShowVerticalLines(false); - jTable.setVerifyInputWhenFocusTarget(false); - jTable.setUpdateSelectionOnSort(false); - jTable.setShowHorizontalLines(false); - jTable.setModel(new DefaultTableModel()); - jTable.setSurrendersFocusOnKeystroke(true); - scrollPane.setViewportView(jTable); + ruleTable.setShowVerticalLines(false); + ruleTable.setVerifyInputWhenFocusTarget(false); + ruleTable.setUpdateSelectionOnSort(false); + ruleTable.setShowHorizontalLines(false); + ruleTable.setModel(new DefaultTableModel()); + ruleTable.setSurrendersFocusOnKeystroke(true); + scrollPane.setViewportView(ruleTable); } add(scrollPane, new GridBagConstraints(1, 0, 1, 4, 0.0, 0.0, @@ -154,7 +154,7 @@ public class RulePane extends JPanel { public void mouseClicked(MouseEvent e) { isEdit = true; ruleRemoveMouseClicked(e, pane); - model = (DefaultTableModel) jTable.getModel(); + model = (DefaultTableModel) ruleTable.getModel(); isEdit = false; } }); @@ -164,7 +164,7 @@ public class RulePane extends JPanel { new Insets(0, 5, 3, 2), 0, 0)); // JFormDesigner - End of component initialization //GEN-END:initComponents - jTable.setModel(model); + ruleTable.setModel(model); model.setDataVector(data, title); model.addTableModelListener(new TableModelListener() { @Override @@ -173,14 +173,14 @@ public class RulePane extends JPanel { } }); - jTable.setRowSorter(new TableRowSorter(model)); + ruleTable.setRowSorter(new TableRowSorter(model)); } // JFormDesigner - Variables declaration - DO NOT MODIFY //GEN-BEGIN:variables public JButton addButton; public JButton editButton; public JScrollPane scrollPane; - public JTable jTable; + public JTable ruleTable; public JButton removeButton; // JFormDesigner - End of variables declaration //GEN-END:variables private final String[] title = new String[]{"Loaded", "Name", "Regex", "Color", "Scope", "Engine"}; diff --git a/src/main/java/burp/ui/RuleSetting.java b/src/main/java/burp/ui/RuleSetting.java index cd1cd8c..7fddd7d 100644 --- a/src/main/java/burp/ui/RuleSetting.java +++ b/src/main/java/burp/ui/RuleSetting.java @@ -14,67 +14,56 @@ public class RuleSetting extends JPanel { } public void initComponents() { - // JFormDesigner - Component initialization - DO NOT MODIFY //GEN-BEGIN:initComponents - label5 = new JLabel(); - label4 = new JLabel(); - Regex = new JTextField(); - label3 = new JLabel(); - label2 = new JLabel(); + engineLabel = new JLabel(); + scopeLabel = new JLabel(); + regexTextField = new JTextField(); + regexLabel = new JLabel(); + nameLabel = new JLabel(); Name = new JTextField(); - ScopeSelect = new JComboBox<>(); - EngineSelect = new JComboBox<>(); - label6 = new JLabel(); - ColorSelect = new JComboBox<>(); + scopeComboBox = new JComboBox<>(); + engineComboBox = new JComboBox<>(); + colorLabel = new JLabel(); + colorComboBox = new JComboBox<>(); - //======== this ======== setLayout(null); - //---- label5 ---- - label5.setText("Engine:"); - add(label5); - label5.setBounds(new Rectangle(new Point(10, 175), label5.getPreferredSize())); + engineLabel.setText("Engine:"); + add(engineLabel); + engineLabel.setBounds(new Rectangle(new Point(10, 175), engineLabel.getPreferredSize())); - //---- label4 ---- - label4.setText("Scope:"); - add(label4); - label4.setBounds(new Rectangle(new Point(10, 135), label4.getPreferredSize())); - add(Regex); - Regex.setBounds(70, 50, 265, 30); + scopeLabel.setText("Scope:"); + add(scopeLabel); + scopeLabel.setBounds(new Rectangle(new Point(10, 135), scopeLabel.getPreferredSize())); + add(regexTextField); + regexTextField.setBounds(70, 50, 265, 30); - //---- label3 ---- - label3.setText("Regex:"); - add(label3); - label3.setBounds(new Rectangle(new Point(10, 55), label3.getPreferredSize())); + regexLabel.setText("Regex:"); + add(regexLabel); + regexLabel.setBounds(new Rectangle(new Point(10, 55), regexLabel.getPreferredSize())); - //---- label2 ---- - label2.setText("Name:"); - add(label2); - label2.setBounds(new Rectangle(new Point(10, 15), label2.getPreferredSize())); + nameLabel.setText("Name:"); + add(nameLabel); + nameLabel.setBounds(new Rectangle(new Point(10, 15), nameLabel.getPreferredSize())); add(Name); Name.setBounds(70, 10, 265, 30); - //---- ScopeSelect ---- - ScopeSelect.setModel(new DefaultComboBoxModel<>(Config.scopeArray)); - add(ScopeSelect); - ScopeSelect.setBounds(70, 130, 265, ScopeSelect.getPreferredSize().height); + scopeComboBox.setModel(new DefaultComboBoxModel<>(Config.scopeArray)); + add(scopeComboBox); + scopeComboBox.setBounds(70, 130, 265, scopeComboBox.getPreferredSize().height); - //---- EngineSelect ---- - EngineSelect.setModel(new DefaultComboBoxModel<>(Config.engineArray)); - add(EngineSelect); - EngineSelect.setBounds(70, 170, 265, EngineSelect.getPreferredSize().height); + engineComboBox.setModel(new DefaultComboBoxModel<>(Config.engineArray)); + add(engineComboBox); + engineComboBox.setBounds(70, 170, 265, engineComboBox.getPreferredSize().height); - //---- label7 ---- - label6.setText("Color:"); - add(label6); - label6.setBounds(new Rectangle(new Point(10, 95), label6.getPreferredSize())); + colorLabel.setText("Color:"); + add(colorLabel); + colorLabel.setBounds(new Rectangle(new Point(10, 95), colorLabel.getPreferredSize())); - //---- ColorSelect ---- - ColorSelect.setModel(new DefaultComboBoxModel<>(Config.colorArray)); - add(ColorSelect); - ColorSelect.setBounds(70, 90, 265, ColorSelect.getPreferredSize().height); + colorComboBox.setModel(new DefaultComboBoxModel<>(Config.colorArray)); + add(colorComboBox); + colorComboBox.setBounds(70, 90, 265, colorComboBox.getPreferredSize().height); { - // compute preferred size Dimension preferredSize = new Dimension(); for(int i = 0; i < getComponentCount(); i++) { Rectangle bounds = getComponent(i).getBounds(); @@ -87,19 +76,16 @@ public class RuleSetting extends JPanel { setMinimumSize(preferredSize); setPreferredSize(preferredSize); } - // JFormDesigner - End of component initialization //GEN-END:initComponents } - // JFormDesigner - Variables declaration - DO NOT MODIFY //GEN-BEGIN:variables - private JLabel label5; - private JLabel label4; - public JTextField Regex; - private JLabel label3; - private JLabel label2; + private JLabel engineLabel; + private JLabel scopeLabel; + public JTextField regexTextField; + private JLabel regexLabel; + private JLabel nameLabel; public JTextField Name; - public JComboBox ScopeSelect; - public JComboBox EngineSelect; - private JLabel label6; - public JComboBox ColorSelect; - // JFormDesigner - End of variables declaration //GEN-END:variables + public JComboBox scopeComboBox; + public JComboBox engineComboBox; + private JLabel colorLabel; + public JComboBox colorComboBox; }