psmith 2003/06/18 20:52:08
Modified: src/java/org/apache/log4j/chainsaw WelcomePanel.java
WelcomePanel.html
Added: src/java/org/apache/log4j/chainsaw log4j-receiver-sample.xml
Log:
Added a button to the WelcomePanel mini toolbar that displays
an example Log4j.xml configuration file with a number of Receivers
configured, all within the Welcome Panels html display.
Revision Changes Path
1.7 +26 -7
jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw/WelcomePanel.java
Index: WelcomePanel.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw/WelcomePanel.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- WelcomePanel.java 19 Jun 2003 03:38:59 -0000 1.6
+++ WelcomePanel.java 19 Jun 2003 03:52:07 -0000 1.7
@@ -74,6 +74,7 @@
import javax.swing.JEditorPane;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
+import javax.swing.JSeparator;
import javax.swing.SwingUtilities;
import javax.swing.event.HyperlinkEvent;
import javax.swing.event.HyperlinkListener;
@@ -92,6 +93,7 @@
private final JEditorPane textInfo = new JEditorPane();
private final URLToolbar urlToolbar = new URLToolbar();
private final URL helpURL;
+ private final URL exampleConfigURL;
public WelcomePanel() {
setLayout(new BorderLayout());
@@ -101,6 +103,10 @@
helpURL =
getClass().getClassLoader().getResource(
"org/apache/log4j/chainsaw/WelcomePanel.html");
+
+ exampleConfigURL =
+ getClass().getClassLoader().getResource(
+ "org/apache/log4j/chainsaw/log4j-receiver-sample.xml");
if (helpURL != null) {
textInfo.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
@@ -164,9 +170,6 @@
private final Action homeAction =
new AbstractAction(null, new ImageIcon(ChainsawIcons.ICON_HOME)) {
public void actionPerformed(ActionEvent e) {
- if (urlStack.isEmpty()) {
- return;
- }
setURL(helpURL);
urlStack.clear();
}
@@ -183,8 +186,8 @@
c.weighty = 0.0;
c.ipadx = 1;
c.ipady = 1;
- c.gridx = 0;
- c.gridy = 0;
+// c.gridx = 0;
+// c.gridy = 0;
c.fill = GridBagConstraints.NONE;
c.anchor = GridBagConstraints.WEST;
@@ -192,12 +195,28 @@
JButton home = new SmallButton(homeAction);
add(home, c);
- c.gridx = 1;
+ add(new JSeparator(), c);
+
+// c.gridx = 1;
JButton previous = new SmallButton(previousAction);
previous.setEnabled(false);
add(previous, c);
+
+ add(new JSeparator(), c);
+
+// c.gridx = 2;
+ final Action exampleConfigAction = new AbstractAction("View example Receiver
configuration"){
+
+ public void actionPerformed(ActionEvent e) {
+ setURL(exampleConfigURL);
+
+ }};
+ exampleConfigAction.putValue(Action.SHORT_DESCRIPTION, "Displays an example
Log4j configuration file with several Receivers defined.");
+
+ JButton exampleButton = new SmallButton(exampleConfigAction);
+ add(exampleButton, c);
- c.gridx = 2;
+// c.gridx = 3;
c.weightx = 1;
JPanel p = new JPanel();
add(p, c);
1.13 +1 -1
jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw/WelcomePanel.html
Index: WelcomePanel.html
===================================================================
RCS file:
/home/cvs/jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw/WelcomePanel.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- WelcomePanel.html 19 Jun 2003 03:37:49 -0000 1.12
+++ WelcomePanel.html 19 Jun 2003 03:52:07 -0000 1.13
@@ -90,7 +90,7 @@
<tr valign="top" bgcolor="#EEEEEE">
<td nowrap class="HotKey">ALT-D</td>
<td width="50" align="center">-</td>
- <td colspan="4">Show/Hiden the Detail pane</td>
+ <td colspan="4">Show/Hide the Detail pane</td>
</tr>
<tr valign="top">
<td nowrap class="HotKey">ALT-X</td>
1.1
jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw/log4j-receiver-sample.xml
Index: log4j-receiver-sample.xml
===================================================================
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"; debug="true">
<appender name="A2" class="org.apache.log4j.ConsoleAppender">
<layout class="org.apache.log4j.SimpleLayout"/>
</appender>
<plugin name="SocketReceiver" class="org.apache.log4j.net.SocketReceiver">
<param name="Port" value="4445"/>
</plugin>
<plugin name="XMLSocketReceiver" class="org.apache.log4j.net.XMLSocketReceiver">
<param name="decoder" value="org.apache.log4j.xml.UtilLoggingXMLDecoder"/>
<param name="Port" value="2222"/>
</plugin>
<plugin name="UDPReceiver" class="org.apache.log4j.net.UDPReceiver">
<param name="Port" value="4446"/>
</plugin>
<plugin name="MulticastReceiver" class="org.apache.log4j.net.MulticastReceiver">
<param name="Port" value="4449"/>
<param name="Address" value="224.1.1.1"/>
</plugin>
<root>
<level value="debug"/>
</root>
</log4j:configuration>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
