You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gr...@apache.org on 2023/09/30 17:45:04 UTC
[logging-chainsaw] branch master updated (72d7d05 -> 6827a45)
This is an automated email from the ASF dual-hosted git repository.
grobmeier pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/logging-chainsaw.git
from 72d7d05 added final to fields
new 3586d60 cleanups: better var names, constants, generics, final
new 7a514f3 avoided wildcard import
new 6e29601 improved javadoc, added @Override
new 8e4f0e3 made table preparation reusable
new c5737ba removed: code did check on color rules but was disabled
new d410a1d removed now unnecessary parameter for applyRules
new 9ca939b removed: commented saveAsDefault button code
new 3a66dcc removed: more unused save color code, also save bypass flag code
new 1e4ed02 added final keywords
new f45da92 added default case to switch
new 6827a45 converted variable to local
The 11 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/log4j/chainsaw/color/ColorPanel.java | 385 ++++++++-------------
.../org/apache/log4j/chainsaw/color/Colorizer.java | 9 +-
.../apache/log4j/chainsaw/color/RuleColorizer.java | 54 +--
3 files changed, 176 insertions(+), 272 deletions(-)
[logging-chainsaw] 10/11: added default case to switch
Posted by gr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
grobmeier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-chainsaw.git
commit f45da923d0e034b9cc3035fd894516b46dbaada3
Author: Christian Grobmeier <cg...@grobmeier.de>
AuthorDate: Sat Sep 30 19:42:17 2023 +0200
added default case to switch
---
src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java b/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
index 53e8f91..080fddc 100644
--- a/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
@@ -885,15 +885,16 @@ public class ColorPanel extends JPanel {
@Override
public Object getValueAt(int row, int col) {
ColorRule rule = colorRules.get(row);
- switch( col ){
+ switch (col){
case 0:
return rule.getExpression();
case 1:
return rule.getBackgroundColor();
case 2:
return rule.getForegroundColor();
+ default:
+ return "foo";
}
- return "foo";
}
@Override
[logging-chainsaw] 02/11: avoided wildcard import
Posted by gr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
grobmeier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-chainsaw.git
commit 7a514f33223dd8519d25d3cc79e5ff238025ef5c
Author: Christian Grobmeier <cg...@grobmeier.de>
AuthorDate: Sat Sep 30 19:11:43 2023 +0200
avoided wildcard import
---
src/main/java/org/apache/log4j/chainsaw/color/Colorizer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/log4j/chainsaw/color/Colorizer.java b/src/main/java/org/apache/log4j/chainsaw/color/Colorizer.java
index bd84345..3b536b4 100644
--- a/src/main/java/org/apache/log4j/chainsaw/color/Colorizer.java
+++ b/src/main/java/org/apache/log4j/chainsaw/color/Colorizer.java
@@ -17,7 +17,7 @@
package org.apache.log4j.chainsaw.color;
-import java.awt.*;
+import java.awt.Color;
import org.apache.log4j.chainsaw.logevents.ChainsawLoggingEvent;
[logging-chainsaw] 04/11: made table preparation reusable
Posted by gr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
grobmeier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-chainsaw.git
commit 8e4f0e3a7aeddb0f27b613a01bb8047bc0079fcf
Author: Christian Grobmeier <cg...@grobmeier.de>
AuthorDate: Sat Sep 30 19:33:38 2023 +0200
made table preparation reusable
---
.../apache/log4j/chainsaw/color/ColorPanel.java | 72 ++++++++--------------
1 file changed, 27 insertions(+), 45 deletions(-)
diff --git a/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java b/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
index 3e24886..8b861bc 100644
--- a/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
@@ -341,34 +341,11 @@ public class ColorPanel extends JPanel {
}
private void configureTable() {
- rulesTable.setToolTipText(LABEL_DOUBLE_CLICK_TO_EDIT);
- rulesTable.setRowHeight(20);
- rulesTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
- rulesTable.setColumnSelectionAllowed(false);
+ prepareTable(rulesTable, 1,2);
- Vector backgroundColors = new Vector(RuleColorizer.getDefaultColors());
- Vector foregroundColors = new Vector(RuleColorizer.getDefaultColors());
- backgroundColors.add(LABEL_BROWSE);
- foregroundColors.add(LABEL_BROWSE);
-
- JComboBox background = new JComboBox(backgroundColors);
- background.setMaximumRowCount(15);
- background.setRenderer(new ColorListCellRenderer());
-
- JComboBox foreground = new JComboBox(foregroundColors);
- foreground.setMaximumRowCount(15);
- foreground.setRenderer(new ColorListCellRenderer());
-
- DefaultCellEditor backgroundEditor = new DefaultCellEditor(background);
- DefaultCellEditor foregroundEditor = new DefaultCellEditor(foreground);
JTextField textField = new JTextField();
- textField.addKeyListener(
- new ExpressionRuleContext(filterModel, textField));
- rulesTable.getColumnModel().getColumn(1).setCellEditor(backgroundEditor);
- rulesTable.getColumnModel().getColumn(2).setCellEditor(foregroundEditor);
+ textField.addKeyListener(new ExpressionRuleContext(filterModel, textField));
- background.addItemListener(new ColorItemListener(background));
- foreground.addItemListener(new ColorItemListener(foreground));
rulesTable.getColumnModel().getColumn(0).setCellRenderer(
new ExpressionTableCellRenderer());
@@ -379,36 +356,41 @@ public class ColorPanel extends JPanel {
}
private void configureSingleEntryColorTable(JTable thisTable) {
- thisTable.setToolTipText(LABEL_DOUBLE_CLICK_TO_EDIT);
- thisTable.setRowHeight(20);
- thisTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
- thisTable.setColumnSelectionAllowed(false);
+ prepareTable(thisTable, 0, 1);
- Vector backgroundColors = new Vector(RuleColorizer.getDefaultColors());
- Vector foregroundColors = new Vector(RuleColorizer.getDefaultColors());
- backgroundColors.add(LABEL_BROWSE);
- foregroundColors.add(LABEL_BROWSE);
+ thisTable.getColumnModel().getColumn(0).setCellRenderer(
+ new ColorTableCellRenderer());
+ thisTable.getColumnModel().getColumn(1).setCellRenderer(
+ new ColorTableCellRenderer());
+ }
- JComboBox background = new JComboBox(backgroundColors);
- background.setMaximumRowCount(15);
- background.setRenderer(new ColorListCellRenderer());
+ private JTable prepareTable(JTable table, int backgroundEditorPosition, int foregroundEditorPosition) {
+ table.setToolTipText(LABEL_DOUBLE_CLICK_TO_EDIT);
+ table.setRowHeight(20);
+ table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+ table.setColumnSelectionAllowed(false);
- JComboBox foreground = new JComboBox(foregroundColors);
- foreground.setMaximumRowCount(15);
- foreground.setRenderer(new ColorListCellRenderer());
+ JComboBox background = createColorJComboBox();
+ JComboBox foreground = createColorJComboBox();
DefaultCellEditor backgroundEditor = new DefaultCellEditor(background);
DefaultCellEditor foregroundEditor = new DefaultCellEditor(foreground);
- thisTable.getColumnModel().getColumn(0).setCellEditor(backgroundEditor);
- thisTable.getColumnModel().getColumn(1).setCellEditor(foregroundEditor);
+
+ table.getColumnModel().getColumn(backgroundEditorPosition).setCellEditor(backgroundEditor);
+ table.getColumnModel().getColumn(foregroundEditorPosition).setCellEditor(foregroundEditor);
background.addItemListener(new ColorItemListener(background));
foreground.addItemListener(new ColorItemListener(foreground));
+ return table;
+ }
- thisTable.getColumnModel().getColumn(0).setCellRenderer(
- new ColorTableCellRenderer());
- thisTable.getColumnModel().getColumn(1).setCellRenderer(
- new ColorTableCellRenderer());
+ private JComboBox createColorJComboBox() {
+ Vector colors = new Vector(RuleColorizer.getDefaultColors());
+ colors.add(LABEL_BROWSE);
+ JComboBox comboBox = new JComboBox(colors);
+ comboBox.setMaximumRowCount(15);
+ comboBox.setRenderer(new ColorListCellRenderer());
+ return comboBox;
}
public void setCloseActionListener(ActionListener listener) {
[logging-chainsaw] 05/11: removed: code did check on color rules but was disabled
Posted by gr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
grobmeier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-chainsaw.git
commit c5737ba90ae53b02996a29581c62206ed355a1c6
Author: Christian Grobmeier <cg...@grobmeier.de>
AuthorDate: Sat Sep 30 19:37:12 2023 +0200
removed: code did check on color rules but was disabled
---
.../apache/log4j/chainsaw/color/ColorPanel.java | 49 +++-------------------
1 file changed, 5 insertions(+), 44 deletions(-)
diff --git a/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java b/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
index 8b861bc..ab5d8a4 100644
--- a/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
@@ -406,51 +406,12 @@ public class ColorPanel extends JPanel {
void applyRules(String ruleSet, RuleColorizer applyingColorizer) {
rulesTable.getColumnModel().getColumn(0).getCellEditor().stopCellEditing();
-// List list = new ArrayList();
-// Vector vector = rulesTableModel.getDataVector();
- StringBuilder result = new StringBuilder();
-//
-// for (int i = 0; i < vector.size(); i++) {
-// Vector v = (Vector) vector.elementAt(i);
-//
-// try {
-// Rule expressionRule = ExpressionRule.getRule((String) v.elementAt(0));
-// Color background = getBackground();
-// Color foreground = getForeground();
-//
-// if (v.elementAt(1) instanceof Color) {
-// background = (Color) v.elementAt(1);
-// }
-//
-// if (v.elementAt(2) instanceof Color) {
-// foreground = (Color) v.elementAt(2);
-// }
-//
-// ColorRule r = new ColorRule((String) v.elementAt(0), expressionRule, background, foreground);
-// list.add(r);
-// } catch (IllegalArgumentException iae) {
-// if (!result.toString().equals("")) {
-// result.append("<br>");
-// }
-//
-// result.append(iae.getMessage());
-// }
-// }
+ ((ExpressionTableCellRenderer) rulesTable.getColumnModel().getColumn(0).getCellRenderer())
+ .setToolTipText(LABEL_DOUBLE_CLICK_TO_EDIT);
+ statusBar.setText(DEFAULT_STATUS);
- //all rules are valid, they can be applied
- if (result.toString().equals("")) {
- ((ExpressionTableCellRenderer) rulesTable.getColumnModel().getColumn(0).getCellRenderer())
- .setToolTipText(LABEL_DOUBLE_CLICK_TO_EDIT);
- statusBar.setText(DEFAULT_STATUS);
-
- //only update rules if there were no errors
- applyingColorizer.setRules(rulesTableModel.rules());
-
- } else {
- statusBar.setText("Errors - see expression tooltip (color filters won't be active until errors are resolved)");
- ((ExpressionTableCellRenderer) rulesTable.getColumnModel().getColumn(0).getCellRenderer())
- .setToolTipText("<html>" + result.toString() + "</html>");
- }
+ //only update rules if there were no errors
+ applyingColorizer.setRules(rulesTableModel.rules());
}
JPanel buildClosePanel() {
[logging-chainsaw] 09/11: added final keywords
Posted by gr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
grobmeier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-chainsaw.git
commit 1e4ed025d23e0622609c61c5068cde3b1d5f65e9
Author: Christian Grobmeier <cg...@grobmeier.de>
AuthorDate: Sat Sep 30 19:41:39 2023 +0200
added final keywords
---
src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java b/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
index 0ff74cf..53e8f91 100644
--- a/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
@@ -750,11 +750,11 @@ public class ColorPanel extends JPanel {
}
class SelectedIcon implements Icon {
- private boolean isSelected;
- private int width = 9;
- private int height = 18;
- private int[] xPoints = new int[4];
- private int[] yPoints = new int[4];
+ private final boolean isSelected;
+ private final int width = 9;
+ private final int height = 18;
+ private final int[] xPoints = new int[4];
+ private final int[] yPoints = new int[4];
public SelectedIcon(boolean isSelected) {
this.isSelected = isSelected;
[logging-chainsaw] 06/11: removed now unnecessary parameter for applyRules
Posted by gr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
grobmeier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-chainsaw.git
commit d410a1d9d9e44b81f65c42ec548c8eb26437d001
Author: Christian Grobmeier <cg...@grobmeier.de>
AuthorDate: Sat Sep 30 19:38:34 2023 +0200
removed now unnecessary parameter for applyRules
---
src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java b/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
index ab5d8a4..910669a 100644
--- a/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
@@ -60,7 +60,6 @@ public class ColorPanel extends JPanel {
private static final String LABEL_DOUBLE_CLICK_TO_EDIT = "Double click to edit";
private static final String LABEL_BROWSE = "Browse...";
private static final String DEFAULT_STATUS = "<html>Double click a rule field to edit the rule</html>";
- private static final String CURRENT_RULE_SET = "Default";
private static final Logger logger = LogManager.getLogger();
@@ -403,14 +402,13 @@ public class ColorPanel extends JPanel {
}
}
- void applyRules(String ruleSet, RuleColorizer applyingColorizer) {
+ void applyRules(RuleColorizer applyingColorizer) {
rulesTable.getColumnModel().getColumn(0).getCellEditor().stopCellEditing();
((ExpressionTableCellRenderer) rulesTable.getColumnModel().getColumn(0).getCellRenderer())
.setToolTipText(LABEL_DOUBLE_CLICK_TO_EDIT);
statusBar.setText(DEFAULT_STATUS);
- //only update rules if there were no errors
applyingColorizer.setRules(rulesTableModel.rules());
}
@@ -436,7 +434,7 @@ public class ColorPanel extends JPanel {
applyButton.addActionListener(
new AbstractAction() {
public void actionPerformed(ActionEvent evt) {
- applyRules(CURRENT_RULE_SET, parentLogPanel.getCurrentRuleColorizer());
+ applyRules(parentLogPanel.getCurrentRuleColorizer());
saveSearchColors();
saveAlternatingColors();
saveBypassFlag();
[logging-chainsaw] 03/11: improved javadoc, added @Override
Posted by gr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
grobmeier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-chainsaw.git
commit 6e296011d98e3ed0c27025169e3e258650ad584e
Author: Christian Grobmeier <cg...@grobmeier.de>
AuthorDate: Sat Sep 30 19:12:10 2023 +0200
improved javadoc, added @Override
---
src/main/java/org/apache/log4j/chainsaw/color/Colorizer.java | 7 +++----
src/main/java/org/apache/log4j/chainsaw/color/RuleColorizer.java | 8 ++++++++
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/log4j/chainsaw/color/Colorizer.java b/src/main/java/org/apache/log4j/chainsaw/color/Colorizer.java
index 3b536b4..ea95b70 100644
--- a/src/main/java/org/apache/log4j/chainsaw/color/Colorizer.java
+++ b/src/main/java/org/apache/log4j/chainsaw/color/Colorizer.java
@@ -20,7 +20,6 @@ package org.apache.log4j.chainsaw.color;
import java.awt.Color;
import org.apache.log4j.chainsaw.logevents.ChainsawLoggingEvent;
-
/**
* Given a LoggingEvent, can determine an appropriate
* Color to use based on whatever this implementation
@@ -33,10 +32,10 @@ public interface Colorizer {
/**
* Given a LoggingEvent, returns a Color to use for background,
* or null if this instance cannot determine one, or that
- * the stanard color should be used.
+ * the standard color should be used.
*
- * @param event
- * @return background color
+ * @param event the ChainsawLoggingEvent
+ * @return background color or null
*/
Color getBackgroundColor(ChainsawLoggingEvent event);
diff --git a/src/main/java/org/apache/log4j/chainsaw/color/RuleColorizer.java b/src/main/java/org/apache/log4j/chainsaw/color/RuleColorizer.java
index 65c1103..fff4137 100644
--- a/src/main/java/org/apache/log4j/chainsaw/color/RuleColorizer.java
+++ b/src/main/java/org/apache/log4j/chainsaw/color/RuleColorizer.java
@@ -149,6 +149,10 @@ public class RuleColorizer implements Colorizer {
rules.removeIf( x -> x.getExpression().equals( expression ) );
}
+ /**
+ * {{@inheritDoc}
+ */
+ @Override
public Color getBackgroundColor(ChainsawLoggingEvent event) {
for (ColorRule rule : rules) {
@@ -160,6 +164,10 @@ public class RuleColorizer implements Colorizer {
return null;
}
+ /**
+ * {{@inheritDoc}
+ */
+ @Override
public Color getForegroundColor(ChainsawLoggingEvent event) {
for (ColorRule rule : rules) {
[logging-chainsaw] 07/11: removed: commented saveAsDefault button code
Posted by gr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
grobmeier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-chainsaw.git
commit 9ca939b20cf4730f3b4242a00caff328a8bc59a6
Author: Christian Grobmeier <cg...@grobmeier.de>
AuthorDate: Sat Sep 30 19:39:05 2023 +0200
removed: commented saveAsDefault button code
---
.../java/org/apache/log4j/chainsaw/color/ColorPanel.java | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java b/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
index 910669a..0308225 100644
--- a/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
@@ -417,18 +417,6 @@ public class ColorPanel extends JPanel {
panel.setLayout(new BoxLayout(panel, BoxLayout.X_AXIS));
panel.add(Box.createHorizontalGlue());
-// JButton saveAsDefaultButton = new JButton(" Save as default ");
-//
-// saveAsDefaultButton.addActionListener(
-// new AbstractAction() {
-// public void actionPerformed(ActionEvent evt) {
-// RuleColorizer defaultColorizer = allLogPanelColorizers.get(ChainsawConstants.DEFAULT_COLOR_RULE_NAME);
-// applyRules(currentRuleSet, defaultColorizer);
-// }
-// });
-//
-// panel.add(saveAsDefaultButton);
-
JButton applyButton = new JButton(" Apply ");
applyButton.addActionListener(
[logging-chainsaw] 01/11: cleanups: better var names, constants, generics, final
Posted by gr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
grobmeier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-chainsaw.git
commit 3586d60f37973b4271ff63a71b67ad7f62482718
Author: Christian Grobmeier <cg...@grobmeier.de>
AuthorDate: Sat Sep 30 19:09:18 2023 +0200
cleanups: better var names, constants, generics, final
---
.../apache/log4j/chainsaw/color/ColorPanel.java | 237 ++++++++++-----------
.../apache/log4j/chainsaw/color/RuleColorizer.java | 46 ++--
2 files changed, 132 insertions(+), 151 deletions(-)
diff --git a/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java b/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
index 652705c..3e24886 100644
--- a/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
@@ -17,7 +17,6 @@
package org.apache.log4j.chainsaw.color;
-import org.apache.log4j.chainsaw.ApplicationPreferenceModel;
import org.apache.log4j.chainsaw.ChainsawConstants;
import org.apache.log4j.chainsaw.ExpressionRuleContext;
import org.apache.log4j.chainsaw.filter.FilterModel;
@@ -34,8 +33,6 @@ import javax.swing.table.TableCellRenderer;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.awt.event.ComponentEvent;
-import java.awt.event.ComponentListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.awt.event.MouseEvent;
@@ -43,7 +40,7 @@ import java.util.*;
import java.util.List;
import javax.swing.table.AbstractTableModel;
import javax.swing.table.TableCellEditor;
-import javax.swing.table.TableModel;
+
import org.apache.commons.configuration2.AbstractConfiguration;
import org.apache.log4j.chainsaw.LogPanel;
import org.apache.log4j.chainsaw.prefs.SettingsManager;
@@ -60,39 +57,33 @@ import org.apache.logging.log4j.Logger;
* @author Scott Deboy <sdeboy@apache.org>
*/
public class ColorPanel extends JPanel {
- private static final Logger logger = LogManager.getLogger();
+ private static final String LABEL_DOUBLE_CLICK_TO_EDIT = "Double click to edit";
+ private static final String LABEL_BROWSE = "Browse...";
private static final String DEFAULT_STATUS = "<html>Double click a rule field to edit the rule</html>";
- private final String currentRuleSet = "Default";
-
-// private RuleColorizer colorizer;
- private JPanel rulesPanel;
- private FilterModel filterModel;
- private RulesTableModel rulesTableModel;
- private JScrollPane tableScrollPane;
- private JTable rulesTable;
+ private static final String CURRENT_RULE_SET = "Default";
+
+ private static final Logger logger = LogManager.getLogger();
+
+ private final FilterModel filterModel;
+ private final RulesTableModel rulesTableModel;
+ private final JScrollPane tableScrollPane;
+ private final JTable rulesTable;
private ActionListener closeListener;
- private JLabel statusBar;
- private Vector<String> columns;
- private final String noTab = "None";
- private DefaultComboBoxModel logPanelColorizersModel;
- private Map<String, RuleColorizer> allLogPanelColorizers;
-// private RuleColorizer currentLogPanelColorizer;
- private JTable searchTable;
- private DefaultTableModel searchTableModel;
- private Vector<String> searchColumns;
- private Vector<Vector<Color>> searchDataVector;
- private Vector<Color> searchDataVectorEntry;
- private RuleColorizer m_globalColorizer;
-
- private JTable alternatingColorTable;
- private DefaultTableModel alternatingColorTableModel;
- private Vector<String> alternatingColorColumns;
- private Vector<Vector<Color>> alternatingColorDataVector;
- private Vector<Color> alternatingColorDataVectorEntry;
+ private final JLabel statusBar;
+ private static final String NO_TAB = "None";
+ private final DefaultComboBoxModel<String> logPanelColorizersModel;
+ private final Map<String, RuleColorizer> allLogPanelColorizers;
+ private final JTable searchTable;
+ private final DefaultTableModel searchTableModel;
+ private final Vector<Color> searchDataVectorEntry;
+ private final RuleColorizer globalColorizer;
+ private final JTable alternatingColorTable;
+ private final DefaultTableModel alternatingColorTableModel;
+ private final Vector<Color> alternatingColorDataVectorEntry;
private JCheckBox bypassSearchColorsCheckBox;
- private JCheckBox m_globalRulesCheckbox;
- private LogPanel m_parentLogPanel;
- private JLabel m_rulesLabel;
+ private JCheckBox globalRulesCheckbox;
+ private final LogPanel parentLogPanel;
+ private JLabel rulesLabel;
public ColorPanel(final RuleColorizer globalColorizer,
final FilterModel filterModel,
@@ -104,10 +95,10 @@ public class ColorPanel extends JPanel {
this.filterModel = filterModel;
this.allLogPanelColorizers = allLogPanelColorizers;
- this.m_globalColorizer = globalColorizer;
- this.m_parentLogPanel = parent;
+ this.globalColorizer = globalColorizer;
+ this.parentLogPanel = parent;
- m_parentLogPanel.getCurrentRuleColorizer().addPropertyChangeListener(
+ parentLogPanel.getCurrentRuleColorizer().addPropertyChangeListener(
"colorrule",
evt -> updateColors());
@@ -127,32 +118,28 @@ public class ColorPanel extends JPanel {
alternatingColorTable.setRowHeight(ChainsawConstants.DEFAULT_ROW_HEIGHT);
alternatingColorTable.setPreferredScrollableViewportSize(new Dimension(30, 30));
- columns = new Vector<>();
- columns.add("Expression");
- columns.add("Background");
- columns.add("Foreground");
-
- searchColumns = new Vector<>();
+ Vector<String> searchColumns = new Vector<>();
searchColumns.add("Background");
searchColumns.add("Foreground");
- alternatingColorColumns = new Vector<>();
- alternatingColorColumns.add("Background");
- alternatingColorColumns.add("Foreground");
-
//searchtable contains only a single-entry vector containing a two-item vector (foreground, background)
- searchDataVector = new Vector<>();
+ Vector<Vector<Color>> searchDataVector = new Vector<>();
searchDataVectorEntry = new Vector<>();
searchDataVectorEntry.add(configuration.get(Color.class, "searchBackgroundColor", ChainsawConstants.FIND_LOGGER_BACKGROUND));
searchDataVectorEntry.add(configuration.get(Color.class, "searchForegroundColor", ChainsawConstants.FIND_LOGGER_FOREGROUND));
searchDataVector.add(searchDataVectorEntry);
searchTableModel.setDataVector(searchDataVector, searchColumns);
- alternatingColorDataVector = new Vector<>();
+ Vector<Vector<Color>> alternatingColorDataVector = new Vector<>();
alternatingColorDataVectorEntry = new Vector<>();
alternatingColorDataVectorEntry.add(configuration.get(Color.class, "alternatingColorBackground", ChainsawConstants.COLOR_ODD_ROW_BACKGROUND));
alternatingColorDataVectorEntry.add(configuration.get(Color.class, "alternatingColorForeground", ChainsawConstants.COLOR_ODD_ROW_FOREGROUND));
alternatingColorDataVector.add(alternatingColorDataVectorEntry);
+
+ Vector<String> alternatingColorColumns = new Vector<>();
+ alternatingColorColumns.add("Background");
+ alternatingColorColumns.add("Foreground");
+
alternatingColorTableModel.setDataVector(alternatingColorDataVector, alternatingColorColumns);
rulesTable.setPreferredScrollableViewportSize(new Dimension(525, 200));
@@ -184,9 +171,6 @@ public class ColorPanel extends JPanel {
statusBar = new JLabel(DEFAULT_STATUS);
- rulesPanel = buildRulesPanel();
- rulesPanel.setAlignmentX(Component.LEFT_ALIGNMENT);
-
JPanel rightPanel = new JPanel(new BorderLayout());
JPanel rightOuterPanel = new JPanel();
@@ -217,6 +201,10 @@ public class ColorPanel extends JPanel {
JPanel statusPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
statusPanel.add(statusBar);
southPanel.add(statusPanel);
+
+ JPanel rulesPanel = buildRulesPanel();
+ rulesPanel.setAlignmentX(Component.LEFT_ALIGNMENT);
+
rightPanel.add(rulesPanel, BorderLayout.CENTER);
rightPanel.add(southPanel, BorderLayout.SOUTH);
rightOuterPanel.add(rightPanel);
@@ -245,7 +233,7 @@ public class ColorPanel extends JPanel {
newColorizer.setRules(sourceColorizer.getRules());
parent.setRuleColorizer(newColorizer);
updateColors();
- m_parentLogPanel.getCurrentRuleColorizer().addPropertyChangeListener(
+ parentLogPanel.getCurrentRuleColorizer().addPropertyChangeListener(
"colorrule",
evt -> updateColors());
}
@@ -256,12 +244,12 @@ public class ColorPanel extends JPanel {
Object selectedItem = loadPanelColorizersComboBox.getSelectedItem();
if (selectedItem != null) {
String selectedColorizerName = selectedItem.toString();
- copyRulesAction.setEnabled(!(noTab.equals(selectedColorizerName)));
+ copyRulesAction.setEnabled(!(NO_TAB.equals(selectedColorizerName)));
}
});
copyRulesAction.putValue(Action.NAME, "Copy color rules");
- copyRulesAction.setEnabled(!(noTab.equals(loadPanelColorizersComboBox.getSelectedItem())));
+ copyRulesAction.setEnabled(!(NO_TAB.equals(loadPanelColorizersComboBox.getSelectedItem())));
JButton copyRulesButton = new JButton(copyRulesAction);
topPanel.add(copyRulesButton);
@@ -274,12 +262,11 @@ public class ColorPanel extends JPanel {
}
public void loadLogPanelColorizers() {
- if (logPanelColorizersModel.getIndexOf(noTab) == -1) {
- logPanelColorizersModel.addElement(noTab);
+ if (logPanelColorizersModel.getIndexOf(NO_TAB) == -1) {
+ logPanelColorizersModel.addElement(NO_TAB);
}
- RuleColorizer currentLogPanelColorizer = m_parentLogPanel.getCurrentRuleColorizer();
- for (Object o : allLogPanelColorizers.entrySet()) {
- Map.Entry entry = (Map.Entry) o;
+ RuleColorizer currentLogPanelColorizer = parentLogPanel.getCurrentRuleColorizer();
+ for (Map.Entry<String, RuleColorizer> entry : allLogPanelColorizers.entrySet()) {
if (!entry.getValue().equals(currentLogPanelColorizer) && (logPanelColorizersModel.getIndexOf(entry.getKey()) == -1)) {
logPanelColorizersModel.addElement(entry.getKey());
}
@@ -295,15 +282,15 @@ public class ColorPanel extends JPanel {
public void componentChanged(){
logger.debug( "Color panel changed. Current colorizer: {} Global colorizer: {}",
- m_parentLogPanel.getCurrentRuleColorizer(),
- m_globalColorizer);
+ parentLogPanel.getCurrentRuleColorizer(),
+ globalColorizer);
- if( m_globalColorizer == m_parentLogPanel.getCurrentRuleColorizer() ){
- m_globalRulesCheckbox.setSelected(true);
- m_rulesLabel.setText("Global rules:");
+ if( globalColorizer == parentLogPanel.getCurrentRuleColorizer() ){
+ globalRulesCheckbox.setSelected(true);
+ rulesLabel.setText("Global rules:");
}else{
- m_globalRulesCheckbox.setSelected(false);
- m_rulesLabel.setText("Rules:");
+ globalRulesCheckbox.setSelected(false);
+ rulesLabel.setText("Rules:");
}
loadLogPanelColorizers();
@@ -354,15 +341,15 @@ public class ColorPanel extends JPanel {
}
private void configureTable() {
- rulesTable.setToolTipText("Double click to edit");
+ rulesTable.setToolTipText(LABEL_DOUBLE_CLICK_TO_EDIT);
rulesTable.setRowHeight(20);
rulesTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
rulesTable.setColumnSelectionAllowed(false);
Vector backgroundColors = new Vector(RuleColorizer.getDefaultColors());
Vector foregroundColors = new Vector(RuleColorizer.getDefaultColors());
- backgroundColors.add("Browse...");
- foregroundColors.add("Browse...");
+ backgroundColors.add(LABEL_BROWSE);
+ foregroundColors.add(LABEL_BROWSE);
JComboBox background = new JComboBox(backgroundColors);
background.setMaximumRowCount(15);
@@ -392,15 +379,15 @@ public class ColorPanel extends JPanel {
}
private void configureSingleEntryColorTable(JTable thisTable) {
- thisTable.setToolTipText("Double click to edit");
+ thisTable.setToolTipText(LABEL_DOUBLE_CLICK_TO_EDIT);
thisTable.setRowHeight(20);
thisTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
thisTable.setColumnSelectionAllowed(false);
Vector backgroundColors = new Vector(RuleColorizer.getDefaultColors());
Vector foregroundColors = new Vector(RuleColorizer.getDefaultColors());
- backgroundColors.add("Browse...");
- foregroundColors.add("Browse...");
+ backgroundColors.add(LABEL_BROWSE);
+ foregroundColors.add(LABEL_BROWSE);
JComboBox background = new JComboBox(backgroundColors);
background.setMaximumRowCount(15);
@@ -471,7 +458,7 @@ public class ColorPanel extends JPanel {
//all rules are valid, they can be applied
if (result.toString().equals("")) {
((ExpressionTableCellRenderer) rulesTable.getColumnModel().getColumn(0).getCellRenderer())
- .setToolTipText("Double click to edit");
+ .setToolTipText(LABEL_DOUBLE_CLICK_TO_EDIT);
statusBar.setText(DEFAULT_STATUS);
//only update rules if there were no errors
@@ -506,7 +493,7 @@ public class ColorPanel extends JPanel {
applyButton.addActionListener(
new AbstractAction() {
public void actionPerformed(ActionEvent evt) {
- applyRules(currentRuleSet, m_parentLogPanel.getCurrentRuleColorizer());
+ applyRules(CURRENT_RULE_SET, parentLogPanel.getCurrentRuleColorizer());
saveSearchColors();
saveAlternatingColors();
saveBypassFlag();
@@ -531,14 +518,14 @@ public class ColorPanel extends JPanel {
}
private void saveSearchColors() {
- Vector thisVector = (Vector) searchTableModel.getDataVector().get(0);
+ Vector thisVector = searchTableModel.getDataVector().get(0);
AbstractConfiguration globalConfig = SettingsManager.getInstance().getGlobalConfiguration();
globalConfig.setProperty("searchBackgroundColor", RuleColorizer.colorToRGBString((Color) thisVector.get(0)));
globalConfig.setProperty("searchForegroundColor", RuleColorizer.colorToRGBString((Color) thisVector.get(1)));
}
private void saveAlternatingColors() {
- Vector thisVector = (Vector) alternatingColorTableModel.getDataVector().get(0);
+ Vector thisVector = alternatingColorTableModel.getDataVector().get(0);
// applicationPreferenceModel.setAlternatingBackgroundColor((Color) thisVector.get(0));
Color alternatingColorForegroundColor = (Color) thisVector.get(1);
// applicationPreferenceModel.setAlternatingForegroundColor(alternatingColorForegroundColor);
@@ -624,32 +611,32 @@ public class ColorPanel extends JPanel {
panel.add(Box.createVerticalStrut(10));
- m_rulesLabel = new JLabel("Rules:");
- m_globalRulesCheckbox = new JCheckBox("Use global rules");
+ rulesLabel = new JLabel("Rules:");
+ globalRulesCheckbox = new JCheckBox("Use global rules");
- if( m_globalColorizer == m_parentLogPanel.getCurrentRuleColorizer() ){
- m_globalRulesCheckbox.setSelected(true);
- m_rulesLabel.setText("Global rules:");
+ if( globalColorizer == parentLogPanel.getCurrentRuleColorizer() ){
+ globalRulesCheckbox.setSelected(true);
+ rulesLabel.setText("Global rules:");
}
- m_globalRulesCheckbox.addActionListener(
+ globalRulesCheckbox.addActionListener(
new AbstractAction() {
@Override
public void actionPerformed(ActionEvent ae) {
- if( m_globalRulesCheckbox.isSelected() ){
- m_parentLogPanel.setRuleColorizer( m_globalColorizer );
+ if( globalRulesCheckbox.isSelected() ){
+ parentLogPanel.setRuleColorizer(globalColorizer);
}else{
- m_parentLogPanel.setRuleColorizer(new RuleColorizer());
+ parentLogPanel.setRuleColorizer(new RuleColorizer());
}
componentChanged();
- m_parentLogPanel.getCurrentRuleColorizer().addPropertyChangeListener(
+ parentLogPanel.getCurrentRuleColorizer().addPropertyChangeListener(
"colorrule",
evt -> updateColors());
}
});
- panel.add(m_globalRulesCheckbox);
- panel.add(m_rulesLabel);
+ panel.add(globalRulesCheckbox);
+ panel.add(rulesLabel);
JPanel buttonPanel = new JPanel(new GridLayout(0, 2));
buttonPanel.setAlignmentX(Component.LEFT_ALIGNMENT);
@@ -681,12 +668,7 @@ public class ColorPanel extends JPanel {
e -> {
if (!e.getValueIsAdjusting()) {
int index = rulesTable.getSelectionModel().getMaxSelectionIndex();
-
- if (index < 0) {
- deleteButton.setEnabled(false);
- } else {
- deleteButton.setEnabled(true);
- }
+ deleteButton.setEnabled(index >= 0);
}
});
@@ -898,19 +880,19 @@ public class ColorPanel extends JPanel {
private class RulesTableModel extends AbstractTableModel{
- private List<ColorRule> m_data;
+ private final List<ColorRule> colorRules;
RulesTableModel(){
- m_data = new ArrayList<>();
+ colorRules = new ArrayList<>();
addColorRules();
}
List<ColorRule> rules(){
- return m_data;
+ return colorRules;
}
void clear(){
- m_data.clear();
+ colorRules.clear();
fireTableDataChanged();
}
@@ -918,42 +900,42 @@ public class ColorPanel extends JPanel {
Rule expressionRule = ExpressionRule.getRule("msg=='sample'");
ColorRule newRule =
new ColorRule("msg=='sample'", expressionRule, Color.WHITE, Color.BLACK);
- m_data.add(newRule);
- fireTableRowsInserted(m_data.size() - 1, m_data.size() - 1);
+ colorRules.add(newRule);
+ fireTableRowsInserted(colorRules.size() - 1, colorRules.size() - 1);
}
void deleteRuleAtIndex(int i){
- m_data.remove(i);
+ colorRules.remove(i);
fireTableRowsDeleted(i, i);
}
void moveRowAtIndexDown(int row){
- if( row <= m_data.size() - 2 && row >= 0){
- Collections.swap(m_data, row, row + 1);
+ if( row <= colorRules.size() - 2 && row >= 0){
+ Collections.swap(colorRules, row, row + 1);
fireTableRowsUpdated(row, row + 1);
}
}
void moveRowAtIndexUp(int row){
- if( row <= m_data.size() && row > 0 ){
- Collections.swap(m_data, row, row - 1);
+ if( row <= colorRules.size() && row > 0 ){
+ Collections.swap(colorRules, row, row - 1);
fireTableRowsUpdated(row - 1, row );
}
}
void addColorRules(){
- m_data.addAll( m_parentLogPanel.getCurrentRuleColorizer().getRules() );
+ colorRules.addAll( parentLogPanel.getCurrentRuleColorizer().getRules() );
}
@Override
public void setValueAt(Object aValue, int rowIndex, int columnIndex) {
- if( rowIndex >= m_data.size() ){
+ if( rowIndex >= colorRules.size() ){
return;
}
- String expression = m_data.get(rowIndex).getExpression();
- Rule rule = m_data.get(rowIndex).getRule();
- Color backgroundColor = m_data.get(rowIndex).getBackgroundColor();
- Color foregroundColor = m_data.get(rowIndex).getForegroundColor();
+ String expression = colorRules.get(rowIndex).getExpression();
+ Rule rule = colorRules.get(rowIndex).getRule();
+ Color backgroundColor = colorRules.get(rowIndex).getBackgroundColor();
+ Color foregroundColor = colorRules.get(rowIndex).getForegroundColor();
switch( columnIndex ){
case 0:
@@ -968,7 +950,7 @@ public class ColorPanel extends JPanel {
break;
}
- m_data.set(rowIndex, new ColorRule(expression, rule, backgroundColor, foregroundColor) );
+ colorRules.set(rowIndex, new ColorRule(expression, rule, backgroundColor, foregroundColor) );
// Since the value has been set, resize all of the rows(if required)
rulesTable.setRowHeight(ChainsawConstants.DEFAULT_ROW_HEIGHT);
fireTableRowsUpdated(rowIndex, rowIndex);
@@ -976,7 +958,7 @@ public class ColorPanel extends JPanel {
@Override
public int getRowCount() {
- return m_data.size();
+ return colorRules.size();
}
@Override
@@ -986,7 +968,7 @@ public class ColorPanel extends JPanel {
@Override
public Object getValueAt(int row, int col) {
- ColorRule rule = m_data.get(row);
+ ColorRule rule = colorRules.get(row);
switch( col ){
case 0:
return rule.getExpression();
@@ -999,16 +981,17 @@ public class ColorPanel extends JPanel {
}
@Override
- public String getColumnName(int col){
- switch( col ){
+ public String getColumnName(int col) {
+ switch (col){
case 0:
return "Expression";
case 1:
return "Background Color";
case 2:
return "Foreground Color";
+ default:
+ return "BAD COL NAME";
}
- return "BAD COL NAME";
}
@Override
@@ -1020,8 +1003,7 @@ public class ColorPanel extends JPanel {
private class RulesTableCellEditor extends AbstractCellEditor
implements TableCellEditor{
- private DefaultCellEditor defaultEditor = new DefaultCellEditor(
- new JTextField());
+ private final DefaultCellEditor defaultEditor = new DefaultCellEditor(new JTextField());
@Override
public Object getCellEditorValue() {
@@ -1031,20 +1013,19 @@ public class ColorPanel extends JPanel {
@Override
public Component getTableCellEditorComponent(JTable table, Object value,
boolean isSelected, int row, int column) {
- Component c = defaultEditor.getTableCellEditorComponent(table, value,
+ Component component = defaultEditor.getTableCellEditorComponent(table, value,
isSelected, row, column);
- table.setRowHeight( row, c.getPreferredSize().height );
- return c;
+ table.setRowHeight( row, component.getPreferredSize().height );
+ return component;
}
@Override
- public boolean isCellEditable(EventObject e){
- if (e instanceof MouseEvent) {
- MouseEvent me = (MouseEvent) e;
- return me.getClickCount() >= 2;
+ public boolean isCellEditable(EventObject event){
+ if (event instanceof MouseEvent) {
+ MouseEvent mouseEvent = (MouseEvent) event;
+ return mouseEvent.getClickCount() >= 2;
}
return false;
}
-
}
}
diff --git a/src/main/java/org/apache/log4j/chainsaw/color/RuleColorizer.java b/src/main/java/org/apache/log4j/chainsaw/color/RuleColorizer.java
index 381a796..65c1103 100644
--- a/src/main/java/org/apache/log4j/chainsaw/color/RuleColorizer.java
+++ b/src/main/java/org/apache/log4j/chainsaw/color/RuleColorizer.java
@@ -45,15 +45,16 @@ import org.apache.logging.log4j.Logger;
*/
public class RuleColorizer implements Colorizer {
private static final Logger logger = LogManager.getLogger();
-
- private List<ColorRule> rules;
+ public static final String PROPERTY_CHANGED_COLORRULE = "colorrule";
+
+ private final List<ColorRule> rules;
private final PropertyChangeSupport colorChangeSupport =
new PropertyChangeSupport(this);
- private List<ColorRule> defaultRules = new ArrayList<>();
+
private Rule findRule;
private Rule loggerRule;
- private AbstractConfiguration m_configuration;
- private boolean m_isGlobal;
+ private AbstractConfiguration configuration;
+ private final boolean isGlobal;
private static final String COLORS_EXTENSION = ".colors";
@@ -90,22 +91,22 @@ public class RuleColorizer implements Colorizer {
public RuleColorizer() {
this.rules = defaultRules();
- m_isGlobal = false;
+ isGlobal = false;
}
public RuleColorizer(boolean isGlobal){
this.rules = defaultRules();
- m_isGlobal = isGlobal;
+ this.isGlobal = isGlobal;
}
public void setLoggerRule(Rule loggerRule) {
this.loggerRule = loggerRule;
- colorChangeSupport.firePropertyChange("colorrule", false, true);
+ colorChangeSupport.firePropertyChange(PROPERTY_CHANGED_COLORRULE, false, true);
}
public void setFindRule(Rule findRule) {
this.findRule = findRule;
- colorChangeSupport.firePropertyChange("colorrule", false, true);
+ colorChangeSupport.firePropertyChange(PROPERTY_CHANGED_COLORRULE, false, true);
}
public Rule getFindRule() {
@@ -119,7 +120,7 @@ public class RuleColorizer implements Colorizer {
public void setRules(List<ColorRule> rules) {
this.rules.clear();
this.rules.addAll(rules);
- colorChangeSupport.firePropertyChange("colorrule", false, true);
+ colorChangeSupport.firePropertyChange(PROPERTY_CHANGED_COLORRULE, false, true);
saveColorSettings();
}
@@ -131,7 +132,7 @@ public class RuleColorizer implements Colorizer {
public void addRules(List<ColorRule> newRules) {
rules.addAll( newRules );
- colorChangeSupport.firePropertyChange("colorrule", false, true);
+ colorChangeSupport.firePropertyChange(PROPERTY_CHANGED_COLORRULE, false, true);
saveColorSettings();
}
@@ -139,7 +140,7 @@ public class RuleColorizer implements Colorizer {
public void addRule(ColorRule rule) {
rules.add(rule);
- colorChangeSupport.firePropertyChange("colorrule", false, true);
+ colorChangeSupport.firePropertyChange(PROPERTY_CHANGED_COLORRULE, false, true);
saveColorSettings();
}
@@ -188,15 +189,15 @@ public class RuleColorizer implements Colorizer {
}
public void setConfiguration(AbstractConfiguration configuration){
- m_configuration = configuration;
+ this.configuration = configuration;
}
public void setUseDefaultSettings(boolean useDefaultSettings){
- if( m_configuration == SettingsManager.getInstance().getGlobalConfiguration() ){
+ if( configuration == SettingsManager.getInstance().getGlobalConfiguration() ){
return;
}
- m_configuration.setProperty( "color.rules.default", useDefaultSettings );
+ configuration.setProperty( "color.rules.default", useDefaultSettings );
}
public static String colorToRGBString( Color c ){
@@ -207,13 +208,13 @@ public class RuleColorizer implements Colorizer {
}
private void saveColorSettings(){
- if( m_configuration == null ){
+ if( configuration == null ){
return;
}
- DataConfiguration data = new DataConfiguration(m_configuration);
+ DataConfiguration data = new DataConfiguration(configuration);
- if( !m_isGlobal && m_configuration.getBoolean( "color.rules.default", true ) ){
+ if( !isGlobal && configuration.getBoolean( "color.rules.default", true ) ){
// No need to save, using the default rules
return;
}
@@ -229,15 +230,15 @@ public class RuleColorizer implements Colorizer {
logger.debug( "Saving rule {}. Expression: {}", x, rule.getExpression() );
- m_configuration.setProperty( baseConfigKey + ".expression", rule.getExpression() );
+ configuration.setProperty( baseConfigKey + ".expression", rule.getExpression() );
String bgColorString = colorToRGBString(rule.getBackgroundColor());
String fgColorString = colorToRGBString(rule.getForegroundColor());
data.setProperty( baseConfigKey + ".backgroundColor", bgColorString );
data.setProperty( baseConfigKey + ".foregroundColor", fgColorString );
}
- logger.debug( "all keys for {}:", m_configuration );
- java.util.Iterator<String> s = m_configuration.getKeys();
+ logger.debug( "all keys for {}:", configuration);
+ java.util.Iterator<String> s = configuration.getKeys();
while( s.hasNext() ){
logger.debug( "found key: {}", s.next() );
}
@@ -249,8 +250,7 @@ public class RuleColorizer implements Colorizer {
// dumb way and just load up to 32 color rules, since that seems like
// a good number
List<ColorRule> newRules = new ArrayList<>();
- AbstractConfiguration configuration = m_configuration;
-
+
DataConfiguration data = new DataConfiguration(configuration);
for( int x = 0; x < 32; x++ ){
[logging-chainsaw] 08/11: removed: more unused save color code, also save bypass flag code
Posted by gr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
grobmeier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-chainsaw.git
commit 3a66dcc5c970c252bfd101662c634015b289df1f
Author: Christian Grobmeier <cg...@grobmeier.de>
AuthorDate: Sat Sep 30 19:40:10 2023 +0200
removed: more unused save color code, also save bypass flag code
---
.../java/org/apache/log4j/chainsaw/color/ColorPanel.java | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java b/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
index 0308225..0ff74cf 100644
--- a/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
@@ -424,8 +424,6 @@ public class ColorPanel extends JPanel {
public void actionPerformed(ActionEvent evt) {
applyRules(parentLogPanel.getCurrentRuleColorizer());
saveSearchColors();
- saveAlternatingColors();
- saveBypassFlag();
}
});
@@ -453,17 +451,6 @@ public class ColorPanel extends JPanel {
globalConfig.setProperty("searchForegroundColor", RuleColorizer.colorToRGBString((Color) thisVector.get(1)));
}
- private void saveAlternatingColors() {
- Vector thisVector = alternatingColorTableModel.getDataVector().get(0);
-// applicationPreferenceModel.setAlternatingBackgroundColor((Color) thisVector.get(0));
- Color alternatingColorForegroundColor = (Color) thisVector.get(1);
-// applicationPreferenceModel.setAlternatingForegroundColor(alternatingColorForegroundColor);
- }
-
- private void saveBypassFlag() {
-// applicationPreferenceModel.setBypassSearchColors(bypassSearchColorsCheckBox.isSelected());
- }
-
JPanel buildUpDownPanel() {
JPanel panel = new JPanel(new BorderLayout());
JPanel innerPanel = new JPanel();
[logging-chainsaw] 11/11: converted variable to local
Posted by gr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
grobmeier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-chainsaw.git
commit 6827a4538b126e44543820791df12e4a8307c424
Author: Christian Grobmeier <cg...@grobmeier.de>
AuthorDate: Sat Sep 30 19:44:53 2023 +0200
converted variable to local
---
src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java b/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
index 080fddc..1b6ca98 100644
--- a/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
@@ -77,7 +77,6 @@ public class ColorPanel extends JPanel {
private final Vector<Color> searchDataVectorEntry;
private final RuleColorizer globalColorizer;
private final JTable alternatingColorTable;
- private final DefaultTableModel alternatingColorTableModel;
private final Vector<Color> alternatingColorDataVectorEntry;
private JCheckBox bypassSearchColorsCheckBox;
private JCheckBox globalRulesCheckbox;
@@ -112,7 +111,7 @@ public class ColorPanel extends JPanel {
searchTable.setRowHeight(ChainsawConstants.DEFAULT_ROW_HEIGHT);
searchTable.setPreferredScrollableViewportSize(new Dimension(30, 30));
- alternatingColorTableModel = new DefaultTableModel();
+ DefaultTableModel alternatingColorTableModel = new DefaultTableModel();
alternatingColorTable = new JTable(alternatingColorTableModel);
alternatingColorTable.setRowHeight(ChainsawConstants.DEFAULT_ROW_HEIGHT);
alternatingColorTable.setPreferredScrollableViewportSize(new Dimension(30, 30));