You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-dev@logging.apache.org by sd...@apache.org on 2004/01/08 08:09:00 UTC
cvs commit: logging-log4j/src/java/org/apache/log4j/rule ExpressionRuleContext.java
sdeboy 2004/01/07 23:08:59
Modified: src/java/org/apache/log4j/chainsaw LogPanel.java
TableColorizingRenderer.java
src/java/org/apache/log4j/rule ExpressionRuleContext.java
Log:
Updated expression rule context menu (used in focus on and color rule) to always wrap right hand operands in single quotes
Cleaned up table renderer code
Revision Changes Path
1.47 +0 -4 logging-log4j/src/java/org/apache/log4j/chainsaw/LogPanel.java
Index: LogPanel.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/LogPanel.java,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- LogPanel.java 7 Jan 2004 01:08:05 -0000 1.46
+++ LogPanel.java 8 Jan 2004 07:08:59 -0000 1.47
@@ -507,8 +507,6 @@
preferenceModel.addPropertyChangeListener("dateFormatPattern",
datePrefsChangeListener);
- SettingsManager.getInstance().addSettingsListener(renderer);
-
table.setDefaultRenderer(Object.class, renderer);
table.addMouseMotionListener(new TableColumnDetailMouseListener(table,
@@ -1514,8 +1512,6 @@
File f = new File(SettingsManager.getInstance().getSettingsDirectory() +
File.separator + identifier + LogUI.COLUMNS_EXTENSION);
-
- renderer.loadSettings(event);
if (f.exists()) {
loadColumnSettings(identifier, table.getColumnModel());
1.12 +28 -59 logging-log4j/src/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java
Index: TableColorizingRenderer.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- TableColorizingRenderer.java 31 Dec 2003 09:54:40 -0000 1.11
+++ TableColorizingRenderer.java 8 Jan 2004 07:08:59 -0000 1.12
@@ -51,9 +51,6 @@
import org.apache.log4j.chainsaw.color.Colorizer;
import org.apache.log4j.chainsaw.icons.LevelIconFactory;
-import org.apache.log4j.chainsaw.prefs.LoadSettingsEvent;
-import org.apache.log4j.chainsaw.prefs.SaveSettingsEvent;
-import org.apache.log4j.chainsaw.prefs.SettingsListener;
import org.apache.log4j.helpers.ISO8601DateFormat;
import org.apache.log4j.spi.LoggingEvent;
@@ -71,7 +68,6 @@
import javax.swing.JLabel;
import javax.swing.JTable;
import javax.swing.table.DefaultTableCellRenderer;
-import javax.swing.table.TableModel;
/**
@@ -83,8 +79,7 @@
* @author Paul Smith <ps...@apache.org>
*
*/
-public class TableColorizingRenderer extends DefaultTableCellRenderer
- implements SettingsListener {
+public class TableColorizingRenderer extends DefaultTableCellRenderer {
private static final DateFormat DATE_FORMATTER =
new ISO8601DateFormat(Calendar.getInstance().getTimeZone());
private static final Map iconMap =
@@ -117,23 +112,16 @@
this.toolTipsVisible = toolTipsVisible;
}
- public void loadSettings(LoadSettingsEvent event) {
- }
-
- public void saveSettings(SaveSettingsEvent event) {
- }
-
public Component getTableCellRendererComponent(
final JTable table, Object value, boolean isSelected, boolean hasFocus,
int row, int col) {
value = formatField(value);
- Color backgroundColor = null;
- Color foregroundColor = null;
+ Color background = null;
+ Color foreground = null;
- Component c =
- super.getTableCellRendererComponent(
- table, value, isSelected, hasFocus, row, col);
+ Component c = super.getTableCellRendererComponent(table, value,
+ isSelected, hasFocus, row, col);
int colIndex = table.getColumnModel().getColumn(col).getModelIndex() + 1;
switch (colIndex) {
@@ -142,21 +130,15 @@
idComponent.setForeground(c.getForeground());
idComponent.setBackground(c.getBackground());
c = idComponent;
-
break;
case ChainsawColumns.INDEX_THROWABLE_COL_NAME:
-
if (value instanceof String[]) {
((JLabel) c).setText(((String[]) value)[0]);
- } else {
- ((JLabel) c).setText("");
}
-
break;
case ChainsawColumns.INDEX_LOGGER_COL_NAME:
-
if (loggerPrecision == 0) {
break;
} else {
@@ -173,11 +155,9 @@
((JLabel) c).setText(logger.substring(startPos + 1));
}
}
-
break;
case ChainsawColumns.INDEX_LEVEL_COL_NAME:
-
if (levelUseIcons) {
levelComponent.setIcon((Icon) iconMap.get(value.toString()));
@@ -194,11 +174,10 @@
levelComponent.setIcon(null);
levelComponent.setText(value.toString());
}
-
- levelComponent.setBackground(c.getBackground());
levelComponent.setForeground(c.getForeground());
- c = levelComponent;
+ levelComponent.setBackground(c.getBackground());
+ c = levelComponent;
break;
default:
@@ -209,46 +188,36 @@
return c;
}
- if ((backgroundColor == null) && (getColorizer() != null)) {
- TableModel model = table.getModel();
- LoggingEvent event = null;
-
- if (model instanceof EventContainer) {
- EventContainer model2 = (EventContainer) model;
- event = model2.getRow(row);
-
- if (event == null) {
- //ignore...probably changed displayed cols
- return c;
- }
- } else {
- throw new UnsupportedOperationException(
- getClass() + " can only support an EventContainer TableModel");
+ if (getColorizer() != null) {
+ EventContainer container = (EventContainer) table.getModel();
+ LoggingEvent event = container.getRow(row);
+
+ if (event == null) {
+ //ignore...probably changed displayed cols
+ return c;
}
-
- backgroundColor = getColorizer().getBackgroundColor(event);
- foregroundColor = getColorizer().getForegroundColor(event);
+ background = getColorizer().getBackgroundColor(event);
+ foreground = getColorizer().getForegroundColor(event);
}
- if ((backgroundColor != null)) {
- c.setBackground(backgroundColor);
- } else if (!isSelected) {
- /**
- * Colourize based on row striping
- */
+ /**
+ * Colourize based on row striping
+ */
+ if (background == null) {
if ((row % 2) != 0) {
- c.setBackground(ChainsawConstants.COLOR_ODD_ROW);
+ background = ChainsawConstants.COLOR_ODD_ROW;
} else {
- c.setBackground(ChainsawConstants.COLOR_EVEN_ROW);
+ background = ChainsawConstants.COLOR_EVEN_ROW;
}
}
- if (foregroundColor != null) {
- c.setForeground(foregroundColor);
- } else {
- c.setForeground(Color.black);
+ if (foreground == null) {
+ foreground = Color.black;
}
-
+
+ c.setBackground(background);
+ c.setForeground(foreground);
+
return c;
}
1.3 +12 -2 logging-log4j/src/java/org/apache/log4j/rule/ExpressionRuleContext.java
Index: ExpressionRuleContext.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/rule/ExpressionRuleContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ExpressionRuleContext.java 31 Dec 2003 09:54:40 -0000 1.2
+++ ExpressionRuleContext.java 8 Jan 2004 07:08:59 -0000 1.3
@@ -122,7 +122,12 @@
new KeyAdapter() {
public void keyPressed(KeyEvent e) {
if (e.getKeyCode() == KeyEvent.VK_ENTER) {
- updateField(list.getSelectedValue().toString());
+ String value = list.getSelectedValue().toString();
+ if (getContextKey() != null) {
+ value = "'"+value+"'";
+ }
+
+ updateField(value);
contextMenu.setVisible(false);
}
}
@@ -132,7 +137,12 @@
new MouseAdapter() {
public void mouseClicked(MouseEvent e) {
if (e.getClickCount() == 2) {
- updateField(list.getSelectedValue().toString());
+ String value = list.getSelectedValue().toString();
+ if (getContextKey() != null) {
+ value = "'"+value+"'";
+ }
+
+ updateField(value);
contextMenu.setVisible(false);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org