psmith 2003/06/22 19:50:11
Modified: src/java/org/apache/log4j/chainsaw LogUI.java
ChainsawToolBarAndMenus.java
Log:
Fix for the Receiver menu check box, it wasn't always in sync
with the current state of view.
It's arguable about where this action should appear in the menu system.
Particularly since the View menu is now so long.
Revision Changes Path
1.113 +6 -0
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.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- LogUI.java 20 Jun 2003 06:57:39 -0000 1.112
+++ LogUI.java 23 Jun 2003 02:50:11 -0000 1.113
@@ -590,8 +590,14 @@
getContentPane().invalidate();
getContentPane().validate();
+
+ tbms.stateChange();
}
});
+ }
+
+ boolean isReceiverPanelVisible() {
+ return getContentPane().isAncestorOf(receiversPanel);
}
ChainsawStatusBar getStatusBar() {
1.46 +6 -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.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- ChainsawToolBarAndMenus.java 20 Jun 2003 06:57:40 -0000 1.45
+++ ChainsawToolBarAndMenus.java 23 Jun 2003 02:50:11 -0000 1.46
@@ -125,6 +125,9 @@
private final Action toggleToolbarAction;
private final Action undockAction;
private final Collection lookAndFeelMenus = new ArrayList();
+ private final JCheckBoxMenuItem toggleShowReceiversCheck =
+ new JCheckBoxMenuItem();
+
private final FileMenu fileMenu;
private final JCheckBoxMenuItem toggleStatusBarCheck =
new JCheckBoxMenuItem();
@@ -652,7 +655,7 @@
viewMenu.add(tabMenu);
viewMenu.add(responsiveNess);
viewMenu.addSeparator();
- viewMenu.add(new JCheckBoxMenuItem(showReceiversAction));
+ viewMenu.add(toggleShowReceiversCheck);
viewMenu.add(lookAndFeelMenu);
JMenu helpMenu = new JMenu("Help");
@@ -797,6 +800,7 @@
"Shows the currently configured Log4j Receivers");
action.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke("F6"));
+ toggleShowReceiversCheck.setAction(action);
return action;
}
@@ -1004,6 +1008,7 @@
}
toggleStatusBarCheck.setSelected(logui.isStatusBarVisible());
+ toggleShowReceiversCheck.setSelected(logui.isReceiverPanelVisible());
/**
* We get the currently selected LogPanel, and if null, deactivate some
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
