You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-dev@logging.apache.org by ps...@apache.org on 2003/10/02 10:28:25 UTC

cvs commit: jakarta-log4j/src/java/org/apache/log4j/chainsaw ChainsawToolBarAndMenus.java

psmith      2003/10/02 01:28:25

  Modified:    src/java/org/apache/log4j/chainsaw
                        ChainsawToolBarAndMenus.java
  Log:
  Removed the "Level as Icons/Text" menu choice.
  
  This is now available in each LogPanels preference dialog.
  
  Revision  Changes    Path
  1.17      +3 -33     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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- ChainsawToolBarAndMenus.java	23 Sep 2003 23:28:06 -0000	1.16
  +++ ChainsawToolBarAndMenus.java	2 Oct 2003 08:28:25 -0000	1.17
  @@ -102,7 +102,6 @@
   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.helpers.LogLog;
   
   
  @@ -220,8 +219,7 @@
                   if (entryEnabled != newEnabled) {
                     ((JCheckBoxMenuItem) panelMenuMap.get(entry.getKey())).getModel()
                      .setEnabled(newEnabled);
  -                  panelEnabledMap.put(
  -                    entry.getKey(), new Boolean(newEnabled));
  +                  panelEnabledMap.put(entry.getKey(), new Boolean(newEnabled));
                   }
                 }
               }
  @@ -531,31 +529,6 @@
       viewMenu.add(menuItemClose);
       viewMenu.addSeparator();
   
  -    ButtonGroup levelIconGroup = new ButtonGroup();
  -    JMenu levelIconMenu = new JMenu("Display Level column as");
  -    levelIconMenu.setMnemonic('l');
  -
  -    levelIconGroup.add(levelDisplayIcon);
  -    levelIconGroup.add(levelDisplayText);
  -
  -    levelDisplayIcon.addActionListener(
  -      new ActionListener() {
  -        public void actionPerformed(ActionEvent e) {
  -          levelDisplay = ChainsawConstants.LEVEL_DISPLAY_ICONS;
  -          SettingsManager.getInstance().saveSettings();
  -          SettingsManager.getInstance().loadSettings();
  -        }
  -      });
  -
  -    levelDisplayText.addActionListener(
  -      new ActionListener() {
  -        public void actionPerformed(ActionEvent e) {
  -          levelDisplay = ChainsawConstants.LEVEL_DISPLAY_TEXT;
  -          SettingsManager.getInstance().saveSettings();
  -          SettingsManager.getInstance().loadSettings();
  -        }
  -      });
  -
       ButtonGroup tabPlacementGroup = new ButtonGroup();
       JMenu tabMenu = new JMenu("Tabs");
       tabMenu.setMnemonic('a');
  @@ -634,9 +607,6 @@
         LogLog.debug("Can't find new GTK L&F, might be Windows, or <JDK1.4.2");
       }
   
  -    levelIconMenu.add(levelDisplayIcon);
  -    levelIconMenu.add(levelDisplayText);
  -
       if (levelDisplay.equals(ChainsawConstants.LEVEL_DISPLAY_ICONS)) {
         levelDisplayIcon.setSelected(true);
       } else {
  @@ -648,7 +618,6 @@
   
       viewMenu.add(showTabs);
   
  -    viewMenu.add(levelIconMenu);
       viewMenu.add(tabMenu);
       viewMenu.add(responsiveNess);
       viewMenu.add(lookAndFeelMenu);
  @@ -798,7 +767,8 @@
         Action.SHORT_DESCRIPTION,
         "Shows the currently configured Log4j Receivers");
       action.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke("F6"));
  -    action.putValue(Action.SMALL_ICON, new ImageIcon(ChainsawIcons.ANIM_NET_CONNECT));
  +    action.putValue(
  +      Action.SMALL_ICON, new ImageIcon(ChainsawIcons.ANIM_NET_CONNECT));
       toggleShowReceiversCheck.setAction(action);
   
       return action;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: log4j-dev-help@jakarta.apache.org