psmith 2003/12/19 02:11:55
Modified: src/java/org/apache/log4j/chainsaw
ChainsawToolBarAndMenus.java
Log:
L&F now removed from this area and will be placed within the
App pref panel
Revision Changes Path
1.30 +2 -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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ChainsawToolBarAndMenus.java 16 Dec 2003 11:16:34 -0000 1.29
+++ ChainsawToolBarAndMenus.java 19 Dec 2003 10:11:55 -0000 1.30
@@ -48,19 +48,14 @@
*/
package org.apache.log4j.chainsaw;
-import org.apache.log4j.chainsaw.icons.ChainsawIcons;
-import org.apache.log4j.helpers.LogLog;
-
import java.awt.Dimension;
import java.awt.Insets;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
-
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -70,7 +65,6 @@
import javax.swing.AbstractAction;
import javax.swing.Action;
import javax.swing.Box;
-import javax.swing.ButtonGroup;
import javax.swing.ImageIcon;
import javax.swing.JButton;
import javax.swing.JCheckBoxMenuItem;
@@ -89,6 +83,8 @@
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
+import org.apache.log4j.chainsaw.icons.ChainsawIcons;
+
/**
* Encapsulates the full Toolbar, and menus and all the actions that can be
performed from it.
@@ -430,55 +426,6 @@
viewMenu.add(menuItemClose);
viewMenu.addSeparator();
- final JMenu lookAndFeelMenu = new JMenu("Look & Feel");
- lookAndFeelMenu.setMnemonic('L');
-
- UIManager.LookAndFeelInfo[] lookAndFeels =
UIManager.getInstalledLookAndFeels();
-
- final ButtonGroup lookAndFeelGroup = new ButtonGroup();
-
- for (int i = 0; i < lookAndFeels.length; i++) {
- final UIManager.LookAndFeelInfo lfInfo = lookAndFeels[i];
- final JRadioButtonMenuItem lfItemMenu = new
JRadioButtonMenuItem(lfInfo.getName());
- lfItemMenu.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- SwingUtilities.invokeLater(new Runnable() {
- public void run() {
- logui.setLookAndFeel(lfInfo.getClassName());
- }
- });
- }
- });
-
- lookAndFeelGroup.add(lfItemMenu);
- lookAndFeelMenu.add(lfItemMenu);
- lookAndFeelMenus.add(lfItemMenu);
- }
-
- try {
- final Class gtkLF = Class.forName(
- "com.sun.java.swing.plaf.gtk.GTKLookAndFeel");
- final JRadioButtonMenuItem lfIGTK = new JRadioButtonMenuItem(
- "GTK+ 2.0");
- lfIGTK.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- SwingUtilities.invokeLater(new Runnable() {
- public void run() {
- logui.setLookAndFeel(gtkLF.getName());
- }
- });
- }
- });
- lookAndFeelGroup.add(lfIGTK);
- lookAndFeelMenu.add(lfIGTK);
- lookAndFeelMenus.add(lfIGTK);
- } catch (Exception e) {
- LogLog.debug(
- "Can't find new GTK L&F, might be Windows, or <JDK1.4.2");
- }
-
- viewMenu.add(lookAndFeelMenu);
- viewMenu.addSeparator();
viewMenu.add(showAppPrefs);
JMenu helpMenu = new JMenu("Help");
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
