psmith 2003/12/30 23:04:03
Modified: src/java/org/apache/log4j/chainsaw/messages
MessageCenter.java
src/java/org/apache/log4j/chainsaw ChainsawStatusBar.java
Log:
Removed the Message Center from being accessed via the status bar.
Revision Changes Path
1.3 +22 -44
jakarta-log4j/src/java/org/apache/log4j/chainsaw/messages/MessageCenter.java
Index: MessageCenter.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/chainsaw/messages/MessageCenter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MessageCenter.java 20 Dec 2003 04:54:20 -0000 1.2
+++ MessageCenter.java 31 Dec 2003 07:04:03 -0000 1.3
@@ -49,19 +49,9 @@
package org.apache.log4j.chainsaw.messages;
-import org.apache.log4j.Layout;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.apache.log4j.TTCCLayout;
-import org.apache.log4j.chainsaw.ChainsawConstants;
-import org.apache.log4j.chainsaw.PopupListener;
-import org.apache.log4j.chainsaw.icons.ChainsawIcons;
-import org.apache.log4j.spi.LoggingEvent;
-
import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.event.ActionEvent;
-
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
@@ -71,8 +61,9 @@
import javax.swing.DefaultListCellRenderer;
import javax.swing.ImageIcon;
import javax.swing.JButton;
-import javax.swing.JFrame;
+import javax.swing.JComponent;
import javax.swing.JList;
+import javax.swing.JPanel;
import javax.swing.JPopupMenu;
import javax.swing.JScrollPane;
import javax.swing.JToolBar;
@@ -81,6 +72,16 @@
import javax.swing.event.ListDataEvent;
import javax.swing.event.ListDataListener;
+import org.apache.log4j.Layout;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.apache.log4j.TTCCLayout;
+import org.apache.log4j.chainsaw.ChainsawConstants;
+import org.apache.log4j.chainsaw.PopupListener;
+import org.apache.log4j.chainsaw.SmallButton;
+import org.apache.log4j.chainsaw.icons.ChainsawIcons;
+import org.apache.log4j.spi.LoggingEvent;
+
/**
* The MessageCenter is central place for all elements within Chainsaw to
@@ -109,19 +110,18 @@
private final MessageCenterAppender appender = new MessageCenterAppender();
private ListCellRenderer listCellRenderer =
new LayoutListCellRenderer(layout);
- private boolean visible;
private PropertyChangeSupport propertySupport =
new PropertyChangeSupport(this);
- private JFrame window = new JFrame("Message Center");
private JScrollPane pane = new JScrollPane(messageList);
private final JToolBar toolbar = new JToolBar();
private JPopupMenu popupMenu = new JPopupMenu();
private PopupListener popupListener = new PopupListener(popupMenu);
private Action clearAction;
+ private final JPanel componentPanel = new JPanel(new BorderLayout());
private MessageCenter() {
setupActions();
- setupFrame();
+ setupComponentPanel();
setupLogger();
setupListeners();
setupPopMenu();
@@ -139,7 +139,7 @@
*
*/
private void setupToolbar() {
- JButton clearButton = new JButton(clearAction);
+ JButton clearButton = new SmallButton(clearAction);
clearButton.setText(null);
toolbar.add(clearButton);
@@ -159,15 +159,6 @@
private void setupListeners() {
propertySupport.addPropertyChangeListener(
- "visible",
- new PropertyChangeListener() {
- public void propertyChange(PropertyChangeEvent evt) {
- boolean value = ((Boolean) evt.getNewValue()).booleanValue();
- window.setVisible(value);
- }
- });
-
- propertySupport.addPropertyChangeListener(
"layout",
new PropertyChangeListener() {
public void propertyChange(PropertyChangeEvent evt) {
@@ -208,17 +199,16 @@
logger.setLevel(Level.DEBUG);
}
- private void setupFrame() {
- window.getContentPane().setLayout(new BorderLayout());
-
+ private void setupComponentPanel() {
messageList.setModel(appender.getModel());
messageList.setCellRenderer(listCellRenderer);
- window.getContentPane().add(pane, BorderLayout.CENTER);
- window.getContentPane().add(toolbar, BorderLayout.NORTH);
-
- window.setSize(480, 240);
- window.setIconImage(new ImageIcon(ChainsawIcons.WINDOW_ICON).getImage());
+ componentPanel.add(this.toolbar, BorderLayout.NORTH);
+ componentPanel.add(this.pane, BorderLayout.CENTER);
+ }
+
+ public final JComponent getGUIComponent() {
+ return componentPanel;
}
public ListModel getModel() {
@@ -233,11 +223,6 @@
logger.info(message);
}
- public void setVisible(boolean vis) {
- boolean oldValue = this.visible;
- this.visible = vis;
- propertySupport.firePropertyChange("visible", oldValue, this.visible);
- }
/**
* @return Returns the layout used by the MessageCenter.
@@ -253,13 +238,6 @@
Layout oldValue = this.layout;
this.layout = layout;
propertySupport.firePropertyChange("layout", oldValue, this.layout);
- }
-
- /**
- * @return Returns the visible.
- */
- public final boolean isVisible() {
- return visible;
}
/**
1.9 +3 -27
jakarta-log4j/src/java/org/apache/log4j/chainsaw/ChainsawStatusBar.java
Index: ChainsawStatusBar.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/chainsaw/ChainsawStatusBar.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ChainsawStatusBar.java 20 Dec 2003 00:22:07 -0000 1.8
+++ ChainsawStatusBar.java 31 Dec 2003 07:04:03 -0000 1.9
@@ -49,22 +49,13 @@
package org.apache.log4j.chainsaw;
-import org.apache.log4j.chainsaw.icons.ChainsawIcons;
-import org.apache.log4j.chainsaw.messages.MessageCenter;
-
import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-
import java.text.NumberFormat;
-import javax.swing.AbstractAction;
-import javax.swing.Action;
import javax.swing.BorderFactory;
import javax.swing.Icon;
import javax.swing.ImageIcon;
@@ -74,6 +65,9 @@
import javax.swing.SwingUtilities;
import javax.swing.border.Border;
+import org.apache.log4j.chainsaw.icons.ChainsawIcons;
+import org.apache.log4j.chainsaw.messages.MessageCenter;
+
/**
* A general purpose status bar for all Frame windows
@@ -110,29 +104,11 @@
nf.setGroupingUsed(false);
JPanel statusMsgPanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 2, 2));
- Action showMessageCenterAction = new AbstractAction("...") {
-
- public void actionPerformed(ActionEvent e) {
- MessageCenter.getInstance().setVisible(true);
- }};
- showMessageCenterAction.putValue(Action.SHORT_DESCRIPTION, "Displays the
Message Center");
-
- SmallButton showMessageCenter = new SmallButton(showMessageCenterAction);
-
statusMsgPanel.add(statusMsg);
- statusMsgPanel.add(showMessageCenter);
statusMsgPanel.setBorder(statusBarComponentBorder);
- statusMsgPanel.addMouseListener(new MouseAdapter() {
- public void mouseClicked(MouseEvent e) {
- if(e.getClickCount() >1) {
-
MessageCenter.getInstance().setVisible(!MessageCenter.getInstance().isVisible());
- }
- }
- });
-
pausedLabel.setBorder(statusBarComponentBorder);
pausedLabel.setMinimumSize(
new Dimension(pausedIcon.getIconWidth(), pausedIcon.getIconHeight()));
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
