cvs commit: jakarta-log4j/src/java/org/apache/log4j/chainsaw/receivers ReceiversPanel.java
psmith 2003/12/19 02:10:06
Modified:src/java/org/apache/log4j/chainsaw/receivers
ReceiversPanel.java
Log:
removed the Edit Receiver action, the plugin editor now accomodates
this function.
Also placed the Plugin property editor within a Split pane so it can
be resized.
Revision ChangesPath
1.4 +12 -30
jakarta-log4j/src/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java
Index: ReceiversPanel.java
===
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ReceiversPanel.java 19 Dec 2003 06:54:28 - 1.3
+++ ReceiversPanel.java 19 Dec 2003 10:10:06 - 1.4
@@ -93,6 +93,7 @@
import javax.swing.JPopupMenu;
import javax.swing.JRadioButtonMenuItem;
import javax.swing.JScrollPane;
+import javax.swing.JSplitPane;
import javax.swing.JTextField;
import javax.swing.JToolBar;
import javax.swing.JTree;
@@ -142,7 +143,6 @@
* @author Scott Debogy [EMAIL PROTECTED]
*/
public class ReceiversPanel extends JPanel {
- final Action editReceiverButtonAction;
final Action newReceiverButtonAction;
final Action pauseReceiverButtonAction;
final Action playReceiverButtonAction;
@@ -157,6 +157,8 @@
private final ReceiverToolbar buttonPanel;
private final Runnable updateReceiverTree;
+ private final JSplitPane splitter = new JSplitPane();
+
private final PluginPropertyEditorPanel pluginEditorPanel = new
PluginPropertyEditorPanel();
public ReceiversPanel(final LogUI logui) {
@@ -258,22 +260,6 @@
newReceiverButtonAction.setEnabled(true);
-editReceiverButtonAction =
- new AbstractAction() {
- public void actionPerformed(ActionEvent e) {
-JOptionPane.showMessageDialog(logui, Not Implemented yet, sorry);
- }
-};
-editReceiverButtonAction.putValue(
- Action.SMALL_ICON, new ImageIcon(ChainsawIcons.ICON_EDIT_RECEIVER));
-editReceiverButtonAction.putValue(
- Action.SHORT_DESCRIPTION,
- Edits the configuration of the selected Receiver);
-editReceiverButtonAction.putValue(Action.NAME, Edit Receiver);
-editReceiverButtonAction.setEnabled(false);
-editReceiverButtonAction.putValue(
- Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_E));
-
playReceiverButtonAction =
new AbstractAction() {
public void actionPerformed(ActionEvent e) {
@@ -406,10 +392,16 @@
this.addMouseListener(popupListener);
JComponent component = receiversTree;
-
-add(new JScrollPane(component), BorderLayout.CENTER);
+JScrollPane pane = new JScrollPane(component);
+
+splitter.setOrientation(JSplitPane.VERTICAL_SPLIT);
+
+splitter.setTopComponent(pane);
+splitter.setBottomComponent(pluginEditorPanel);
+
+splitter.setResizeWeight(0.7);
add(buttonPanel, BorderLayout.NORTH);
-add(pluginEditorPanel, BorderLayout.SOUTH);
+add(splitter, BorderLayout.CENTER);
/**
@@ -612,11 +604,9 @@
}
if (object instanceof Receiver) {
- editReceiverButtonAction.setEnabled(true);
newReceiverButtonAction.setEnabled(true);
shutdownReceiverButtonAction.setEnabled(true);
} else {
- editReceiverButtonAction.setEnabled(false);
shutdownReceiverButtonAction.setEnabled(false);
newReceiverButtonAction.setEnabled(true);
}
@@ -822,8 +812,6 @@
add(pauseReceiverButtonAction);
add(shutdownReceiverButtonAction);
addSeparator();
- add(editReceiverButtonAction);
- addSeparator();
final Receiver r = getCurrentlySelectedReceiver();
add(createLevelRadioButton(r, Level.DEBUG));
@@ -867,7 +855,6 @@
JMenuItem startAll = new JMenuItem(startAllAction);
add(newReceiverButtonAction);
- add(editReceiverButtonAction);
addSeparator();
add(startAll);
@@ -1145,12 +1132,7 @@
newReceiverButton.setText(null);
newReceiverButton.addMouseListener(new PopupListener(newReceiverPopup));
- SmallButton editReceiverButton =
-new SmallButton(editReceiverButtonAction);
- editReceiverButton.setText(null);
-
add(newReceiverButton);
- add(editReceiverButton);
addSeparator();
add(playReceiverButton);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-log4j/src/java/org/apache/log4j/chainsaw/receivers ReceiversPanel.java
psmith 2003/12/19 16:22:07
Modified:src/java/org/apache/log4j/chainsaw LogUI.java LogPanel.java
ChainsawStatusBar.java
src/java/org/apache/log4j/chainsaw/receivers
ReceiversPanel.java
Log:
Decoupled components from having to know about the Status bar,
now uses the message center.
LogUI now installs an appender to forward new messages onto the status bar.
Revision ChangesPath
1.60 +46 -30jakarta-log4j/src/java/org/apache/log4j/chainsaw/LogUI.java
Index: LogUI.java
===
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/chainsaw/LogUI.java,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- LogUI.java19 Dec 2003 10:15:59 - 1.59
+++ LogUI.java20 Dec 2003 00:22:06 - 1.60
@@ -104,19 +104,21 @@
import javax.swing.event.HyperlinkEvent;
import javax.swing.event.HyperlinkListener;
+import org.apache.log4j.AppenderSkeleton;
import org.apache.log4j.Level;
import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
import org.apache.log4j.Priority;
import org.apache.log4j.UtilLoggingLevel;
import org.apache.log4j.chainsaw.help.HelpManager;
import org.apache.log4j.chainsaw.help.Tutorial;
import org.apache.log4j.chainsaw.icons.ChainsawIcons;
+import org.apache.log4j.chainsaw.messages.MessageCenter;
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.chainsaw.receivers.ReceiversPanel;
-import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.helpers.OptionConverter;
import org.apache.log4j.net.SocketNodeEventListener;
import org.apache.log4j.plugins.Plugin;
@@ -124,6 +126,8 @@
import org.apache.log4j.plugins.PluginListener;
import org.apache.log4j.plugins.PluginRegistry;
import org.apache.log4j.plugins.Receiver;
+import org.apache.log4j.spi.LoggingEvent;
+
/**
* The main entry point for Chainsaw, this class represents the first frame
@@ -144,11 +148,11 @@
* of 500 is used.
*
* @author Scott Deboy [EMAIL PROTECTED]
- * @author Paul Smith
- *[EMAIL PROTECTED]
+ * @author Paul Smith [EMAIL PROTECTED]
*
*/
public class LogUI extends JFrame implements ChainsawViewer, SettingsListener {
+ private static final Logger messageLogger =
Logger.getLogger(MessageCenter.getInstance().getClass());
private static final String CONFIG_FILE_TO_USE = config.file;
static final String USE_CYCLIC_BUFFER_PROP_NAME = chainsaw.usecyclicbuffer;
static final String CYCLIC_BUFFER_SIZE_PROP_NAME =
@@ -456,6 +460,24 @@
toolbar.setVisible(applicationPreferenceModel.isToolbar());
setStatusBarVisible(applicationPreferenceModel.isStatusBar());
+
+/**
+ * We add a simple appender to the MessageCenter logger
+ * so that each message is displayed in the Status bar
+ */
+messageLogger.addAppender(new AppenderSkeleton(){
+
+ protected void append(LoggingEvent event) {
+getStatusBar().setMessage(event.getMessage().toString());
+ }
+
+ public void close() {
+
+ }
+
+ public boolean requiresLayout() {
+return false;
+ }});
final SocketNodeEventListener socketListener =
new SocketNodeEventListener() {
@@ -464,14 +486,14 @@
}
public void socketClosedEvent(Exception e) {
- statusBar.setMessage(Connection lost! :: + e.getMessage());
+ messageLogger.info(Connection lost! :: + e.getMessage());
}
};
PluginListener pluginListener =
new PluginListener() {
public void pluginStarted(PluginEvent e) {
- statusBar.setMessage(e.getPlugin().getName() + started!);
+ messageLogger.info(e.getPlugin().getName() + started!);
Method method = getAddListenerMethod(e.getPlugin());
@@ -479,7 +501,7 @@
try {
method.invoke(e.getPlugin(), new Object[] { socketListener });
} catch (Exception ex) {
- LogLog.error(Failed to add a SocketNodeEventListener, ex);
+ messageLogger.error(Failed to add a SocketNodeEventListener, ex);
}
}
}
@@ -511,11 +533,11 @@
try {
method.invoke(e.getPlugin(), new Object[] { socketListener });
} catch (Exception ex) {
- LogLog.error(Failed to remove SocketNodeEventListener, ex);
+ messageLogger.error(Failed to remove SocketNodeEventListener, ex);
cvs commit: jakarta-log4j/src/java/org/apache/log4j/chainsaw/receivers ReceiversPanel.java
psmith 2003/12/18 22:54:28
Modified:src/java/org/apache/log4j/chainsaw/receivers
ReceiversPanel.java
Log:
Start of the context sensitive help for the Plugins.
You can right click on a Plugin within the Receivers panel and choose
the Help menu item. This will eventually show the JavaDoc for that class.
Currently, however this is just changing back to the Welcome page.
Revision ChangesPath
1.3 +17 -0
jakarta-log4j/src/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java
Index: ReceiversPanel.java
===
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ReceiversPanel.java 19 Dec 2003 03:21:36 - 1.2
+++ ReceiversPanel.java 19 Dec 2003 06:54:28 - 1.3
@@ -115,6 +115,7 @@
import org.apache.log4j.chainsaw.LogUI;
import org.apache.log4j.chainsaw.PopupListener;
import org.apache.log4j.chainsaw.SmallButton;
+import org.apache.log4j.chainsaw.help.HelpManager;
import org.apache.log4j.chainsaw.icons.ChainsawIcons;
import org.apache.log4j.chainsaw.icons.LevelIconFactory;
import org.apache.log4j.chainsaw.icons.LineIconFactory;
@@ -146,6 +147,7 @@
final Action pauseReceiverButtonAction;
final Action playReceiverButtonAction;
final Action shutdownReceiverButtonAction;
+ private final Action showReceiverHelpAction;
private final Action startAllAction;
private final JPopupMenu popupMenu = new ReceiverPopupMenu();
private final JTree receiversTree = new JTree();
@@ -325,6 +327,19 @@
Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_S));
shutdownReceiverButtonAction.setEnabled(false);
+
+showReceiverHelpAction = new AbstractAction(Help){
+
+ public void actionPerformed(ActionEvent e) {
+ Receiver receiver = getCurrentlySelectedReceiver();
+ if(receiver!=null) {
+
HelpManager.getInstance().showHelpForClass(receiver.getClass());
+ }
+
+ }};
+
+ showReceiverHelpAction.putValue(Action.SMALL_ICON, new
ImageIcon(ChainsawIcons.HELP));
+ showReceiverHelpAction.putValue(Action.SHORT_DESCRIPTION, Displays the
JavaDoc page for this Plugin);
startAllAction =
new AbstractAction(
@@ -818,6 +833,8 @@
addSeparator();
add(createLevelRadioButton(r, Level.OFF));
add(createLevelRadioButton(r, Level.ALL));
+ addSeparator();
+ add(showReceiverHelpAction);
}
private JRadioButtonMenuItem createLevelRadioButton(
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
