sdeboy 2003/12/12 01:05:03
Modified: src/java/org/apache/log4j/chainsaw
ChainsawToolBarAndMenus.java
ApplicationPreferenceModelPanel.java
src/java/org/apache/log4j/chainsaw/prefs default.properties
Log:
* Updated responsiveness default
* Removed unneeded responsiveness menu
* Added tab identifier preference text field - can be changed while application is
running
Revision Changes Path
1.23 +0 -9
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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ChainsawToolBarAndMenus.java 12 Dec 2003 02:25:53 -0000 1.22
+++ ChainsawToolBarAndMenus.java 12 Dec 2003 09:05:03 -0000 1.23
@@ -51,7 +51,6 @@
import java.awt.BorderLayout;
import java.awt.Dimension;
-import java.awt.FlowLayout;
import java.awt.Insets;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@@ -66,17 +65,14 @@
import javax.swing.AbstractAction;
import javax.swing.Action;
import javax.swing.Box;
-import javax.swing.BoxLayout;
import javax.swing.ButtonGroup;
import javax.swing.ImageIcon;
import javax.swing.JButton;
import javax.swing.JCheckBoxMenuItem;
import javax.swing.JComponent;
-import javax.swing.JLabel;
import javax.swing.JMenu;
import javax.swing.JMenuBar;
import javax.swing.JMenuItem;
-import javax.swing.JPanel;
import javax.swing.JRadioButtonMenuItem;
import javax.swing.JSlider;
import javax.swing.JTabbedPane;
@@ -518,10 +514,6 @@
}
});
- JMenu responsiveNess =
- new JMenu(ChainsawToolBarAndMenus.SETTING_RESPONSIVENESS);
- responsiveNess.setMnemonic('R');
-
final JMenu lookAndFeelMenu = new JMenu("Look & Feel");
lookAndFeelMenu.setMnemonic('L');
@@ -583,7 +575,6 @@
tabMenu.add(tabsBottom);
viewMenu.add(tabMenu);
- viewMenu.add(responsiveNess);
viewMenu.add(lookAndFeelMenu);
viewMenu.addSeparator();
viewMenu.add(showAppPrefs);
1.3 +24 -11
jakarta-log4j/src/java/org/apache/log4j/chainsaw/ApplicationPreferenceModelPanel.java
Index: ApplicationPreferenceModelPanel.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/chainsaw/ApplicationPreferenceModelPanel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ApplicationPreferenceModelPanel.java 12 Dec 2003 02:25:53 -0000 1.2
+++ ApplicationPreferenceModelPanel.java 12 Dec 2003 09:05:03 -0000 1.3
@@ -48,16 +48,11 @@
*/
package org.apache.log4j.chainsaw;
-import org.apache.log4j.helpers.LogLog;
-
-import java.awt.Color;
-import java.awt.Component;
+import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
-
import java.util.Dictionary;
import java.util.Hashtable;
@@ -69,13 +64,15 @@
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JSlider;
-import javax.swing.SwingConstants;
+import javax.swing.JTextField;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.TreeModel;
+import org.apache.log4j.helpers.LogLog;
+
/**
* A panel used by the user to modify any application-wide preferences.
@@ -88,12 +85,14 @@
private ApplicationPreferenceModel committedPreferenceModel;
private ApplicationPreferenceModel uncommittedPreferenceModel =
new ApplicationPreferenceModel();
+ JTextField identifierExpression;
ApplicationPreferenceModelPanel(ApplicationPreferenceModel model) {
this.committedPreferenceModel = model;
initComponents();
getOkButton().addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
+
uncommittedPreferenceModel.setIdentifierExpression(identifierExpression.getText());
committedPreferenceModel.apply(uncommittedPreferenceModel);
hidePanel();
}
@@ -171,7 +170,7 @@
1, 4, 2);
Dictionary sliderLabelMap = new Hashtable();
-
+
/**
* @param title
*/
@@ -185,6 +184,7 @@
private void initComponents() {
setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
+ identifierExpression = new JTextField(20);
Box p = new Box(BoxLayout.X_AXIS);
@@ -195,12 +195,15 @@
setupListeners();
initSliderComponent();
-
add(responsiveSlider);
+ JPanel p1 = new JPanel(new FlowLayout(FlowLayout.LEFT));
+
+ p1.add(new JLabel("Tab identifier"));
+ p1.add(Box.createHorizontalStrut(5));
+ p1.add(identifierExpression);
+ add(p1);
add(p);
add(Box.createVerticalGlue());
-
-
}
private void initSliderComponent() {
@@ -229,6 +232,14 @@
}
});
uncommittedPreferenceModel.addPropertyChangeListener(
+ "identifierExpression", new PropertyChangeListener() {
+
+ public void propertyChange(PropertyChangeEvent evt) {
+ identifierExpression.setText(evt.getNewValue().toString());
+ }
+ });
+
+ uncommittedPreferenceModel.addPropertyChangeListener(
"responsiveness", new PropertyChangeListener() {
public void propertyChange(PropertyChangeEvent evt) {
@@ -247,6 +258,7 @@
responsiveSlider.setValue(value);
}
});
+
showNoReceiverWarning.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
@@ -289,6 +301,7 @@
//
showNoReceiverWarning.setSelected(
uncommittedPreferenceModel.isShowNoReceiverWarning());
+
identifierExpression.setText(uncommittedPreferenceModel.getIdentifierExpression());
}
}
1.5 +1 -1
jakarta-log4j/src/java/org/apache/log4j/chainsaw/prefs/default.properties
Index: default.properties
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/chainsaw/prefs/default.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- default.properties 11 Dec 2003 05:45:59 -0000 1.4
+++ default.properties 12 Dec 2003 09:05:03 -0000 1.5
@@ -9,7 +9,7 @@
main.window.width=640
main.window.height=480
tab.placement=3
-Responsiveness=2000
+Responsiveness=1
table.columns.order=ID,Timestamp,Level,Logger,Thread,Message,NDC,MDC,Throwable,Class,Method,File,Line,Properties
table.columns.widths=50,150,50,100,150,300,150,100,300,150,100,100,100,100
StatusBar=true
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
