psmith 2003/12/02 18:28:44
Modified: src/java/org/apache/log4j/chainsaw
ChainsawToolBarAndMenus.java
Log:
removed the Tab menu from the view menu, this will
eventually be replaced with a 'Window' top level menu.
Revision Changes Path
1.20 +9 -55
jakarta-log4j/src/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java
Index: ChainsawToolBarAndMenus.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ChainsawToolBarAndMenus.java 9 Nov 2003 09:59:28 -0000 1.19
+++ ChainsawToolBarAndMenus.java 3 Dec 2003 02:28:44 -0000 1.20
@@ -49,12 +49,6 @@
package org.apache.log4j.chainsaw;
-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.LogLog;
-
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.FlowLayout;
@@ -63,13 +57,11 @@
import java.awt.event.ActionListener;
import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import java.util.Set;
import javax.swing.AbstractAction;
import javax.swing.Action;
@@ -99,6 +91,12 @@
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
+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.LogLog;
+
/**
* Encapsulates the full Toolbar, and menus and all the actions that can be
performed from it.
@@ -156,10 +154,8 @@
private String lastFind = "";
private String levelDisplay = ChainsawConstants.LEVEL_DISPLAY_ICONS;
private final Action[] logPanelSpecificActions;
- private final ChangeListener panelListener;
private Map panelMenuMap = new HashMap();
private Map panelEnabledMap = new HashMap();
- private JMenuItem showTabs;
ChainsawToolBarAndMenus(final LogUI logui) {
this.logui = logui;
@@ -187,44 +183,6 @@
createMenuBar();
createToolbar();
- panelListener =
- new ChangeListener() {
- public void stateChanged(ChangeEvent e) {
- Map m = logui.getPanels();
-
- if (m != null) {
- Set s = m.entrySet();
- Iterator iter = s.iterator();
-
- while (iter.hasNext()) {
- Map.Entry entry = (Map.Entry) iter.next();
-
- if (!panelMenuMap.keySet().contains(entry.getKey())) {
- panelMenuMap.put(
- entry.getKey(),
- getDisplayPanelMenuItem(entry.getKey().toString()));
-
- //default to enabled
- panelEnabledMap.put(entry.getKey(), Boolean.TRUE);
- showTabs.add(
- (JCheckBoxMenuItem) panelMenuMap.get(entry.getKey()));
- }
-
- boolean entryEnabled =
- ((Boolean) panelEnabledMap.get(entry.getKey())).booleanValue();
- boolean newEnabled =
- ((Boolean) entry.getValue()).booleanValue();
-
- if (entryEnabled != newEnabled) {
- ((JCheckBoxMenuItem) panelMenuMap.get(entry.getKey())).getModel()
- .setEnabled(newEnabled);
- panelEnabledMap.put(entry.getKey(), new Boolean(newEnabled));
- }
- }
- }
- }
- };
-
logPanelSpecificActions =
new Action[] {
pauseAction, findNextAction, clearAction, fileMenu.getFileSaveAction(),
@@ -483,8 +441,6 @@
JMenuItem menuUndock = new JMenuItem(undockAction);
- showTabs = new JMenu("Display tabs");
-
toggleDetailMenuItem.setAction(toggleDetailPaneAction);
toggleDetailMenuItem.setSelected(true);
@@ -619,8 +575,6 @@
tabMenu.add(tabsTop);
tabMenu.add(tabsBottom);
- viewMenu.add(showTabs);
-
viewMenu.add(tabMenu);
viewMenu.add(responsiveNess);
viewMenu.add(lookAndFeelMenu);
@@ -1054,9 +1008,9 @@
}
}
- ChangeListener getPanelListener() {
- return panelListener;
- }
+// ChangeListener getPanelListener() {
+// return panelListener;
+// }
private JCheckBoxMenuItem getDisplayPanelMenuItem(final String panelName) {
final JCheckBoxMenuItem item = new JCheckBoxMenuItem(panelName, true);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
