sdeboy 2003/06/02 23:32:59
Modified: src/java/org/apache/log4j/chainsaw
TableColorizingRenderer.java ChainsawConstants.java
LogUI.java DisplayFilter.java
ColorDisplaySelector.java FileMenu.java
ChainsawToolBarAndMenus.java
src/java/org/apache/log4j/chainsaw/prefs
SettingsManager.java default.properties
src/java/org/apache/log4j/xml UtilLoggingEntityResolver.java
Log:
* Removed menus used to save filter/display settings - moved save process to window
closing event
* Level column now supports display of either text or icon via a saved
preference/menu
* Changed 'ID' column semantics from 'row number' back to reception-order ID (wasn't
working right when a display filter was applied - will re-add row number support later)
Revision Changes Path
1.9 +17 -13
jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java
Index: TableColorizingRenderer.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TableColorizingRenderer.java 28 May 2003 16:52:50 -0000 1.8
+++ TableColorizingRenderer.java 3 Jun 2003 06:32:57 -0000 1.9
@@ -49,16 +49,10 @@
package org.apache.log4j.chainsaw;
-import org.apache.log4j.chainsaw.icons.ChainsawIcons;
-import org.apache.log4j.helpers.ISO8601DateFormat;
-
import java.awt.Color;
import java.awt.Component;
import java.awt.Image;
-import java.awt.geom.AffineTransform;
-
import java.text.DateFormat;
-
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
@@ -74,6 +68,12 @@
import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.TableModel;
+import org.apache.log4j.chainsaw.icons.ChainsawIcons;
+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;
+
/**
* A specific TableCellRenderer that colourizes a particular cell based on
@@ -81,8 +81,7 @@
*
* @author Claude Duguay
*/
-public class TableColorizingRenderer extends DefaultTableCellRenderer
- implements FilterChangedListener {
+public class TableColorizingRenderer extends DefaultTableCellRenderer implements
SettingsListener, FilterChangedListener {
private static final DateFormat DATE_FORMATTER =
new ISO8601DateFormat(Calendar.getInstance().getTimeZone());
private Map iconMap = new HashMap();
@@ -93,6 +92,7 @@
private final Color COLOR_ODD = new Color(230, 230, 230);
private final JLabel idComponent = new JLabel();
private final JLabel levelComponent = new JLabel();
+ private String levelDisplay = ChainsawConstants.LEVEL_DISPLAY_ICONS;
/**
* Creates a new TableColorizingRenderer object.
@@ -115,7 +115,6 @@
new ImageIcon(
UIManager.getLookAndFeel().getClass().getResource(
"icons/" + iconFileNames[i]));
- final AffineTransform tx = new AffineTransform();
double scalex = .5;
double scaley = .5;
final int newWidth = (int) (scalex * icon.getIconWidth());
@@ -143,6 +142,12 @@
this.colorFilter = colorFilter;
}
+ public void loadSettings(LoadSettingsEvent event) {
+ levelDisplay = event.getSetting(ChainsawConstants.LEVEL_DISPLAY);
+ }
+
+ public void saveSettings(SaveSettingsEvent event) {}
+
/**
*TODO
*/
@@ -184,7 +189,7 @@
switch (colIndex) {
case ChainsawColumns.INDEX_ID_COL_NAME:
- idComponent.setText("" + row);
+ idComponent.setText(value.toString());
idComponent.setForeground(c.getForeground());
color = isSelected ? c.getBackground() : COLOR_ODD;
c = idComponent;
@@ -195,15 +200,14 @@
Icon icon = (Icon) iconMap.get(value.toString());
- if (icon != null) {
+ if ((levelDisplay != null &&
levelDisplay.equals(ChainsawConstants.LEVEL_DISPLAY_ICONS)) && icon != null) {
levelComponent.setIcon(icon);
levelComponent.setText("");
-
+ levelComponent.setToolTipText(value.toString());
} else {
levelComponent.setIcon(null);
levelComponent.setText(value.toString());
}
- levelComponent.setToolTipText(value.toString());
levelComponent.setForeground(c.getForeground());
color = isSelected ? c.getBackground() : null;
1.7 +5 -1
jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw/ChainsawConstants.java
Index: ChainsawConstants.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw/ChainsawConstants.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ChainsawConstants.java 2 Jun 2003 04:23:07 -0000 1.6
+++ ChainsawConstants.java 3 Jun 2003 06:32:57 -0000 1.7
@@ -47,6 +47,10 @@
static final String EVENT_TYPE_KEY = "log4j.eventtype";
static final String LOG4J_EVENT_TYPE = "log4j";
static final String UTIL_LOGGING_EVENT_TYPE = "util-logging";
-
+
+ static final String LEVEL_DISPLAY = "level.display";
+ static final String LEVEL_DISPLAY_ICONS = "icons";
+ static final String LEVEL_DISPLAY_TEXT = "text";
+
static final String DATETIME_FORMAT = "EEE MMM dd HH:mm:ss z yyyy";
}
1.84 +15 -17
jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw/LogUI.java
Index: LogUI.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw/LogUI.java,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- LogUI.java 2 Jun 2003 04:23:07 -0000 1.83
+++ LogUI.java 3 Jun 2003 06:32:57 -0000 1.84
@@ -166,6 +166,7 @@
private static final String LOOK_AND_FEEL = "LookAndFeel";
private static final String STATUS_BAR = "StatusBar";
private static final String COLUMNS_EXTENSION = ".columns";
+
private static ChainsawSplash splash = null;
ChainsawTabbledPane tabbedPane;
JToolBar toolbar;
@@ -463,6 +464,13 @@
void exit() {
// TODO Ask the user if they want to save the settings via a dialog.
sm.saveSettings();
+ int tabCount = tabbedPane.getTabCount();
+ for (int i=0;i<tabCount;i++) {
+ Component c = tabbedPane.getComponentAt(i);
+ if (c instanceof LogPanel) {
+ ((LogPanel)c).saveSettings();
+ }
+ }
System.exit(0);
}
@@ -720,7 +728,7 @@
}
if (d == null) {
- d = new DisplayFilter();
+ d = new DisplayFilter(ident);
}
return d;
@@ -798,7 +806,7 @@
}
});
- ProfileManager.getInstance().configure(thisPanel);
+ sm.configure(thisPanel);
String msg = "added tab " + ident;
LogLog.debug(msg);
@@ -926,7 +934,7 @@
*
* This is where most of the Swing components are constructed and laid out.
*/
- class LogPanel extends DockablePanel implements Profileable {
+ class LogPanel extends DockablePanel implements SettingsListener {
final ColorFilter colorFilter = new ColorFilter();
final DisplayFilter displayFilter;
final EventContainer tableModel;
@@ -987,6 +995,8 @@
scrollMap.put(ident, scrollToBottom);
TableColorizingRenderer renderer = new TableColorizingRenderer();
+ sm.addSettingsListener(renderer);
+ sm.configure(renderer);
renderer.setColorFilter(colorFilter);
colorFilter.addFilterChangedListener(renderer);
@@ -1648,22 +1658,10 @@
}
}
- /* (non-Javadoc)
- * @see
org.apache.log4j.chainsaw.prefs.Profileable#setProfileName(java.lang.String)
- */
- public void setProfileName(String profileName) {
- this.profileName = profileName;
- }
-
- /* (non-Javadoc)
- * @see org.apache.log4j.chainsaw.prefs.Profileable#getProfileName()
- */
- public String getProfileName() {
- return profileName;
- }
-
public void saveSettings() {
saveColumnSettings(identifier, table.getColumnModel());
+ colorDisplaySelector.save();
+ displayFilter.save();
}
public void saveSettings(SaveSettingsEvent event) {
1.6 +39 -1
jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw/DisplayFilter.java
Index: DisplayFilter.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw/DisplayFilter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DisplayFilter.java 2 Jun 2003 04:23:08 -0000 1.5
+++ DisplayFilter.java 3 Jun 2003 06:32:57 -0000 1.6
@@ -49,7 +49,12 @@
package org.apache.log4j.chainsaw;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.text.DateFormat;
@@ -61,6 +66,8 @@
import java.util.List;
import java.util.Vector;
+import org.apache.log4j.chainsaw.prefs.SettingsManager;
+
/**
* If there are no filters defined, null is returned for color (the table
background should then be used).
@@ -80,11 +87,40 @@
private List colNames = ChainsawColumns.getColumnsNames();
private Vector toolTipColumns;
private Boolean toolTipsEnabled = Boolean.FALSE;
+ private String ident;
- public DisplayFilter() {
+ public DisplayFilter(String ident) {
+ this.ident = ident;
toolTipColumns = new Vector(colNames);
}
+ public void save() {
+ ObjectOutputStream o2 = null;
+
+ try {
+ o2 =
+ new ObjectOutputStream(
+ new BufferedOutputStream(
+ new FileOutputStream(
+ new File(
+ SettingsManager.getInstance().getSettingsDirectory()
+ + File.separator + ident
+ + ChainsawConstants.SETTINGS_EXTENSION))));
+ o2.writeObject(this);
+ o2.flush();
+ } catch (FileNotFoundException fnfe) {
+ } catch (IOException ioe) {
+ ioe.printStackTrace();
+ }
+
+ try {
+ if (o2 != null) {
+ o2.close();
+ }
+ } catch (IOException ioe) {
+ }
+ }
+
public void setCustomFilterOverride(boolean customFilterOverride) {
this.customFilterOverride = customFilterOverride;
notifyListeners();
@@ -281,6 +317,7 @@
private void readObject(java.io.ObjectInputStream in)
throws IOException, ClassNotFoundException {
+ ident = (String) in.readObject();
toolTipColumns = (Vector) in.readObject();
toolTipsEnabled = (Boolean) in.readObject();
colNames = ChainsawColumns.getColumnsNames();
@@ -291,6 +328,7 @@
private void writeObject(java.io.ObjectOutputStream out)
throws IOException {
+ out.writeObject(ident);
out.writeObject(toolTipColumns);
out.writeObject(toolTipsEnabled);
}
1.4 +33 -79
jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw/ColorDisplaySelector.java
Index: ColorDisplaySelector.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw/ColorDisplaySelector.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ColorDisplaySelector.java 2 Jun 2003 04:23:08 -0000 1.3
+++ ColorDisplaySelector.java 3 Jun 2003 06:32:58 -0000 1.4
@@ -49,6 +49,8 @@
package org.apache.log4j.chainsaw;
+import org.apache.log4j.chainsaw.prefs.SettingsManager;
+
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Component;
@@ -92,8 +94,6 @@
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JList;
-import javax.swing.JMenu;
-import javax.swing.JMenuBar;
import javax.swing.JMenuItem;
import javax.swing.JPanel;
import javax.swing.JRadioButton;
@@ -105,8 +105,6 @@
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
-import org.apache.log4j.chainsaw.prefs.SettingsManager;
-
/**
* A JFrame that represents configuration information on how
@@ -163,80 +161,6 @@
this.levelList = levelList;
loadFilters();
- JMenuBar menuBar = new JMenuBar();
-
- JMenu fileMenu = new JMenu("File");
- fileMenu.setMnemonic(KeyEvent.VK_F);
-
- JMenuItem save = new JMenuItem("Save settings");
- save.setMnemonic(KeyEvent.VK_S);
-
- fileMenu.add(save);
-
- menuBar.add(fileMenu);
-
- setJMenuBar(menuBar);
-
- save.addActionListener(
- new AbstractAction() {
- public void actionPerformed(ActionEvent e) {
- ObjectOutputStream o = null;
-
- try {
- o = new ObjectOutputStream(
- new BufferedOutputStream(
- new FileOutputStream(new
File(SettingsManager.getInstance().getSettingsDirectory() + File.separator + title +
ChainsawConstants.FILTERS_EXTENSION))));
- o.writeObject(columnColorMap);
- o.writeObject(columnDisplayMap);
- o.flush();
- } catch (FileNotFoundException fnfe) {
- } catch (IOException ioe) {
- ioe.printStackTrace();
- }
-
- try {
- if (o != null) {
- o.close();
- }
- } catch (IOException ioe) {
- }
-
- ObjectOutputStream o2 = null;
-
- try {
- o2 =
- new ObjectOutputStream(
- new BufferedOutputStream(
- new FileOutputStream(new
File(SettingsManager.getInstance().getSettingsDirectory() + File.separator + title +
ChainsawConstants.SETTINGS_EXTENSION))));
- o2.writeObject(displayFilter);
- o2.flush();
- } catch (FileNotFoundException fnfe) {
- } catch (IOException ioe) {
- ioe.printStackTrace();
- }
-
- try {
- if (o2 != null) {
- o2.close();
- }
- } catch (IOException ioe) {
- }
- }
- });
-
- addWindowListener(
- new WindowAdapter() {
- public void windowClosing(WindowEvent event) {
- if (applyColorUpdateColumn != null) {
- applyColorFilters(applyColorUpdateColumn);
- }
-
- if (applyDisplayUpdateColumn != null) {
- applyDisplayFilters(applyDisplayUpdateColumn);
- }
- }
- });
-
colorChooser.setPreviewPanel(new JPanel());
list.setCellRenderer(new ColoredCellRenderer());
setLocation(50, 50);
@@ -559,6 +483,33 @@
updateAllButtonStyles();
}
+ public void save() {
+ ObjectOutputStream o = null;
+
+ try {
+ o = new ObjectOutputStream(
+ new BufferedOutputStream(
+ new FileOutputStream(
+ new File(
+ SettingsManager.getInstance().getSettingsDirectory()
+ + File.separator + title
+ + ChainsawConstants.FILTERS_EXTENSION))));
+ o.writeObject(columnColorMap);
+ o.writeObject(columnDisplayMap);
+ o.flush();
+ } catch (FileNotFoundException fnfe) {
+ } catch (IOException ioe) {
+ ioe.printStackTrace();
+ }
+
+ try {
+ if (o != null) {
+ o.close();
+ }
+ } catch (IOException ioe) {
+ }
+ }
+
/**
* Regurgitates the Filters from an offline store.
*/
@@ -568,7 +519,10 @@
try {
s = new ObjectInputStream(
new BufferedInputStream(
- new FileInputStream(new
File(SettingsManager.getInstance().getSettingsDirectory() + File.separator + title +
ChainsawConstants.FILTERS_EXTENSION))));
+ new FileInputStream(
+ new File(
+ SettingsManager.getInstance().getSettingsDirectory()
+ + File.separator + title + ChainsawConstants.FILTERS_EXTENSION))));
columnColorMap = (HashMap) s.readObject();
columnDisplayMap = (HashMap) s.readObject();
} catch (IOException ioe) {
1.9 +0 -18
jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw/FileMenu.java
Index: FileMenu.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw/FileMenu.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FileMenu.java 2 Jun 2003 04:23:08 -0000 1.8
+++ FileMenu.java 3 Jun 2003 06:32:58 -0000 1.9
@@ -43,14 +43,6 @@
JMenuItem loadUtilLoggingFile = new JMenuItem(loadUtilLoggingAction);
JMenuItem saveFile = new JMenuItem(saveAction);
- saveSettingsAction = new AbstractAction() {
- public void actionPerformed(ActionEvent e) {
- logUI.getCurrentLogPanel().saveSettings();
- }
- };
-
-
-
exitAction = new AbstractAction() {
public void actionPerformed(ActionEvent e) {
@@ -63,16 +55,8 @@
exitAction.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_X));
exitAction.putValue(Action.NAME, "Exit");
- saveSettingsAction.putValue(Action.ACCELERATOR_KEY,
KeyStroke.getKeyStroke(KeyEvent.VK_T, InputEvent.ALT_MASK));
- saveSettingsAction.putValue(Action.SHORT_DESCRIPTION, "Saves column size and
position");
- saveSettingsAction.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_T));
- saveSettingsAction.putValue(Action.NAME, "Save Settings");
-
- JMenuItem saveSettingsFile = new JMenuItem(saveSettingsAction);
-
JMenuItem menuItemExit = new JMenuItem(exitAction);
- add(saveSettingsFile);
add(loadLog4JFile);
add(loadUtilLoggingFile);
add(saveFile);
@@ -84,7 +68,5 @@
Action getUtilLoggingJFileOpenAction() { return loadUtilLoggingAction;}
Action getFileSaveAction() { return saveAction;}
Action getExitAction() { return exitAction;}
- Action getSaveSettingsAction() { return saveSettingsAction;}
-
}
1.30 +50 -1
jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java
Index: ChainsawToolBarAndMenus.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ChainsawToolBarAndMenus.java 2 Jun 2003 04:23:08 -0000 1.29
+++ ChainsawToolBarAndMenus.java 3 Jun 2003 06:32:58 -0000 1.30
@@ -59,6 +59,7 @@
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.chainsaw.prefs.SettingsManager;
import org.apache.log4j.helpers.LogLog;
import java.awt.BorderLayout;
@@ -147,6 +148,10 @@
new JCheckBoxMenuItem();
private final JRadioButtonMenuItem tabsBottom =
new JRadioButtonMenuItem("Bottom");
+ private final JRadioButtonMenuItem levelDisplayIcon = new
JRadioButtonMenuItem("Icon");
+ private final JRadioButtonMenuItem levelDisplayText = new
JRadioButtonMenuItem("Text");
+ private String levelDisplay = ChainsawConstants.LEVEL_DISPLAY_ICONS;
+
private final Action[] logPanelSpecificActions;
ChainsawToolBarAndMenus(final LogUI logui) {
@@ -227,7 +232,6 @@
closeAction.setEnabled(false);
}
} else {
- fileMenu.getSaveSettingsAction().setEnabled(true);
fileMenu.getFileSaveAction().setEnabled(true);
findTextField.setEnabled(true);
@@ -712,6 +716,31 @@
viewMenu.add(toggleStatusBarCheck);
viewMenu.add(menuItemClose);
+ ButtonGroup levelIconGroup = new ButtonGroup();
+ JMenu levelIconMenu = new JMenu("Display Level column as");
+ levelIconMenu.setMnemonic('l');
+
+ levelIconGroup.add(levelDisplayIcon);
+ levelIconGroup.add(levelDisplayText);
+
+ levelDisplayIcon.addActionListener(
+ new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ levelDisplay = ChainsawConstants.LEVEL_DISPLAY_ICONS;
+ SettingsManager.getInstance().saveSettings();
+ SettingsManager.getInstance().loadSettings();
+ }
+ });
+
+ levelDisplayText.addActionListener(
+ new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ levelDisplay = ChainsawConstants.LEVEL_DISPLAY_TEXT;
+ SettingsManager.getInstance().saveSettings();
+ SettingsManager.getInstance().loadSettings();
+ }
+ });
+
ButtonGroup tabPlacementGroup = new ButtonGroup();
JMenu tabMenu = new JMenu("Tabs");
tabMenu.setMnemonic('a');
@@ -766,9 +795,20 @@
lookAndFeelMenu.add(lfItemMenu);
lookAndFeelMenus.add(lfItemMenu);
}
+ levelIconMenu.add(levelDisplayIcon);
+ levelIconMenu.add(levelDisplayText);
+
+ if (levelDisplay.equals(ChainsawConstants.LEVEL_DISPLAY_ICONS)) {
+ levelDisplayIcon.setSelected(true);
+ } else {
+ levelDisplayText.setSelected(true);
+ }
+
tabMenu.add(tabsTop);
tabMenu.add(tabsBottom);
+
+ viewMenu.add(levelIconMenu);
viewMenu.add(tabMenu);
viewMenu.add(responsiveNess);
viewMenu.addSeparator();
@@ -832,6 +872,7 @@
dockPauseButton.getModel().setSelected(false);
}
+
dockPauseButton.setText("");
toolbar.add(dockPauseButton);
@@ -952,6 +993,12 @@
public void loadSettings(LoadSettingsEvent event) {
try {
+ levelDisplay = event.getSetting(ChainsawConstants.LEVEL_DISPLAY);
+ if (levelDisplay.equals(ChainsawConstants.LEVEL_DISPLAY_ICONS)) {
+ levelDisplayIcon.setSelected(true);
+ } else {
+ levelDisplayText.setSelected(true);
+ }
final int responsiveness =
event.asInt(ChainsawToolBarAndMenus.SETTING_RESPONSIVENESS);
final int tabPlacement =
@@ -978,6 +1025,8 @@
event.saveSetting(
ChainsawToolBarAndMenus.SETTING_TAB_PLACEMENT,
logui.tabbedPane.getTabPlacement());
+
+ event.saveSetting(ChainsawConstants.LEVEL_DISPLAY, levelDisplay);
}
/**
1.6 +6 -0
jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw/prefs/SettingsManager.java
Index: SettingsManager.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw/prefs/SettingsManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SettingsManager.java 2 Jun 2003 04:23:08 -0000 1.5
+++ SettingsManager.java 3 Jun 2003 06:32:59 -0000 1.6
@@ -204,6 +204,12 @@
return new File(System.getProperty("user.home"), ".chainsaw");
}
+ public void configure(SettingsListener listener) {
+ Properties loadedProperties = loadCurrentUserProperties();
+ LoadSettingsEvent event = new LoadSettingsEvent(this, loadedProperties);
+ listener.loadSettings(event);
+ }
+
/**
* Returns the current Properties settings for this user
* by merging the default Properties with the ones we find in their directory.
1.9 +2 -1
jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw/prefs/default.properties
Index: default.properties
===================================================================
RCS file:
/home/cvs/jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw/prefs/default.properties,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- default.properties 23 May 2003 01:09:33 -0000 1.8
+++ default.properties 3 Jun 2003 06:32:59 -0000 1.9
@@ -12,4 +12,5 @@
Responsiveness=2000
table.columns.order=ID,Timestamp,Level,Logger,Thread,Message,NDC,MDC,Throwable,Class,Method,File,Line,Properties
table.columns.widths=50,150,50,100,150,300,150,100,300,150,100,100,100,100
-StatusBar=true
\ No newline at end of file
+StatusBar=true
+level.display=icons
1.3 +1 -1
jakarta-log4j-sandbox/src/java/org/apache/log4j/xml/UtilLoggingEntityResolver.java
Index: UtilLoggingEntityResolver.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j-sandbox/src/java/org/apache/log4j/xml/UtilLoggingEntityResolver.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UtilLoggingEntityResolver.java 6 May 2003 23:38:44 -0000 1.2
+++ UtilLoggingEntityResolver.java 3 Jun 2003 06:32:59 -0000 1.3
@@ -66,7 +66,7 @@
public class UtilLoggingEntityResolver implements EntityResolver {
public InputSource resolveEntity (String publicId, String systemId) {
- System.err.println("piblicID: ["+publicId+"]");
+ System.err.println("publicID: ["+publicId+"]");
System.err.println("systemId: ["+systemId+"]");
if (systemId.endsWith("logger.dtd")) {
Class clazz = getClass();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
