psmith 2003/12/15 17:07:07
Modified: src/java/org/apache/log4j/chainsaw
ChainsawToolBarAndMenus.java LogUI.java
Log:
There is now no need for the ToolbarMenu class to be a
SettingsListener, as this is all handled by the AppPrefModel.
Revision Changes Path
1.28 +1 -73
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.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ChainsawToolBarAndMenus.java 16 Dec 2003 01:00:12 -0000 1.27
+++ ChainsawToolBarAndMenus.java 16 Dec 2003 01:07:07 -0000 1.28
@@ -75,7 +75,6 @@
import javax.swing.JMenuBar;
import javax.swing.JMenuItem;
import javax.swing.JRadioButtonMenuItem;
-import javax.swing.JSlider;
import javax.swing.JTextField;
import javax.swing.JToolBar;
import javax.swing.KeyStroke;
@@ -87,9 +86,6 @@
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;
@@ -98,9 +94,7 @@
* @author Paul Smith <[EMAIL PROTECTED]>
* @author Scott Deboy <[EMAIL PROTECTED]>
*/
-class ChainsawToolBarAndMenus implements ChangeListener, SettingsListener {
- private static final String SETTING_RESPONSIVENESS = "Responsiveness";
- private static final String SETTING_TAB_PLACEMENT = "tabPlacement";
+class ChainsawToolBarAndMenus implements ChangeListener {
private final SmallToggleButton showReceiversButton;
final JTextField findTextField;
private final Action changeModelAction;
@@ -131,14 +125,6 @@
private final JMenu viewMenu = new JMenu("View");
private final JMenuBar menuBar;
private final JCheckBoxMenuItem menuItemClose = new JCheckBoxMenuItem();
- private final JRadioButtonMenuItem levelDisplayIcon =
- new JRadioButtonMenuItem("Icon");
- private final JRadioButtonMenuItem levelDisplayText =
- new JRadioButtonMenuItem("Text");
-// private final JRadioButtonMenuItem tabsBottom =
-// new JRadioButtonMenuItem("Bottom");
-// private final JRadioButtonMenuItem tabsTop = new JRadioButtonMenuItem("Top");
- private final JSlider responsiveSlider;
private final JToolBar toolbar;
private LogUI logui;
private final SmallButton clearButton = new SmallButton();
@@ -174,8 +160,6 @@
showReceiversButton = new SmallToggleButton(showReceiversAction);
toggleDetailPaneAction = createToggleDetailPaneAction();
- responsiveSlider =
- new JSlider(JSlider.VERTICAL, 0, 5000, logui.handler.getQueueInterval());
createMenuBar();
createToolbar();
@@ -247,56 +231,6 @@
}
/**
- * DOCUMENT ME!
- *
- * @param event DOCUMENT ME!
- */
- public void loadSettings(LoadSettingsEvent event) {
- try {
- levelDisplay = event.getSetting(ChainsawConstants.LEVEL_DISPLAY);
-
- if (levelDisplay.equals(ChainsawConstants.LEVEL_DISPLAY_ICONS)) {
- levelDisplayIcon.setSelected(true);
- } else {
- levelDisplayText.setSelected(true);
- }
-
- final int responsiveness =
- event.asInt(ChainsawToolBarAndMenus.SETTING_RESPONSIVENESS);
- final int tabPlacement =
- event.asInt(ChainsawToolBarAndMenus.SETTING_TAB_PLACEMENT);
-
- SwingUtilities.invokeLater(
- new Runnable() {
- public void run() {
- responsiveSlider.setValue(responsiveness);
- logui.getTabbedPane().setTabPlacement(tabPlacement);
- scanState();
- }
- });
- } catch (NullPointerException e) {
- LogLog.error("error decoding setting", e);
- }
- }
-
- /**
- * DOCUMENT ME!
- *
- * @param event DOCUMENT ME!
- */
- public void saveSettings(SaveSettingsEvent event) {
- event.saveSetting(
- ChainsawToolBarAndMenus.SETTING_RESPONSIVENESS,
- responsiveSlider.getValue());
-
- event.saveSetting(
- ChainsawToolBarAndMenus.SETTING_TAB_PLACEMENT,
- logui.getTabbedPane().getTabPlacement());
-
- event.saveSetting(ChainsawConstants.LEVEL_DISPLAY, levelDisplay);
- }
-
- /**
* DOCUMENT ME!
*/
public void stateChange() {
@@ -555,12 +489,6 @@
lookAndFeelMenus.add(lfIGTK);
} catch (Exception e) {
LogLog.debug("Can't find new GTK L&F, might be Windows, or <JDK1.4.2");
- }
-
- if (levelDisplay.equals(ChainsawConstants.LEVEL_DISPLAY_ICONS)) {
- levelDisplayIcon.setSelected(true);
- } else {
- levelDisplayText.setSelected(true);
}
1.55 +0 -1 jakarta-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.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- LogUI.java 14 Dec 2003 21:27:38 -0000 1.54
+++ LogUI.java 16 Dec 2003 01:07:07 -0000 1.55
@@ -796,7 +796,6 @@
getSettingsManager().addSettingsListener(this);
getSettingsManager().addSettingsListener(applicationPreferenceModel);
- getSettingsManager().addSettingsListener(getToolBarAndMenus());
getSettingsManager().loadSettings();
setVisible(true);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
