psmith 2003/12/22 18:18:40
Modified: src/java/org/apache/log4j/chainsaw LogUI.java
ApplicationPreferenceModel.java
ApplicationPreferenceModelPanel.java
src/java/org/apache/log4j/chainsaw/prefs default.properties
Log:
added self explanatory ShowSplashScreen application preference.
Revision Changes Path
1.65 +3 -3 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.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- LogUI.java 22 Dec 2003 22:02:21 -0000 1.64
+++ LogUI.java 23 Dec 2003 02:18:40 -0000 1.65
@@ -278,7 +278,7 @@
applyLookAndFeel(model.getLookAndFeelClassName());
- createChainsawGUI(model, true, null);
+ createChainsawGUI(model, null);
}
/**
@@ -291,10 +291,10 @@
* DOCUMENT ME!
*/
public static void createChainsawGUI(ApplicationPreferenceModel model,
- boolean showSplash, Action shutdownAction) {
+ Action shutdownAction) {
LogUI logUI = new LogUI();
- if (showSplash) {
+ if (model.isShowSplash()) {
showSplash(logUI);
}
1.11 +18 -1
jakarta-log4j/src/java/org/apache/log4j/chainsaw/ApplicationPreferenceModel.java
Index: ApplicationPreferenceModel.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/chainsaw/ApplicationPreferenceModel.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ApplicationPreferenceModel.java 20 Dec 2003 05:27:16 -0000 1.10
+++ ApplicationPreferenceModel.java 23 Dec 2003 02:18:40 -0000 1.11
@@ -71,7 +71,7 @@
private boolean toolbar;
private boolean receivers;
private boolean confirmExit;
-
+ private boolean showSplash;
private String lookAndFeelClassName;
@@ -191,6 +191,7 @@
setReceivers(event.asBoolean("receivers"));
setLookAndFeelClassName(event.getSetting("lookAndFeelClassName"));
setConfirmExit(event.asBoolean("confirmExit"));
+ setShowSplash(event.asBoolean("showSplash"));
}
/* (non-Javadoc)
@@ -206,6 +207,7 @@
event.saveSetting("receivers", isReceivers());
event.saveSetting("lookAndFeelClassName", getLookAndFeelClassName());
event.saveSetting("confirmExit",isConfirmExit());
+ event.saveSetting("showSplash", isShowSplash());
}
/**
@@ -223,6 +225,7 @@
setReceivers(model.isReceivers());
setLookAndFeelClassName(model.getLookAndFeelClassName());
setConfirmExit(model.isConfirmExit());
+ setShowSplash(model.isShowSplash());
}
/**
* @return Returns the responsiveness.
@@ -336,4 +339,18 @@
firePropertyChange("confirmExit", oldValue, this.confirmExit);
}
+ /**
+ * @return Returns the showSplash.
+ */
+ public final boolean isShowSplash() {
+ return showSplash;
+ }
+ /**
+ * @param showSplash The showSplash to set.
+ */
+ public final void setShowSplash(boolean showSplash) {
+ boolean oldValue = this.showSplash;
+ this.showSplash = showSplash;
+ firePropertyChange("showSplash", oldValue,this.showSplash);
+ }
}
1.10 +26 -1
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ApplicationPreferenceModelPanel.java 22 Dec 2003 20:41:04 -0000 1.9
+++ ApplicationPreferenceModelPanel.java 23 Dec 2003 02:18:40 -0000 1.10
@@ -372,6 +372,7 @@
public class GeneralAllPrefPanel extends BasicPrefPanel {
private final JCheckBox showNoReceiverWarning =
new JCheckBox("Prompt me on startup if there are no Receivers defined");
+ private final JCheckBox showSplash = new JCheckBox("Show Splash screen at
startup");
private final JSlider responsiveSlider =
new JSlider(JSlider.HORIZONTAL, 1, 4, 2);
private final JCheckBox confirmExit = new JCheckBox("Confirm Exit");
@@ -411,7 +412,17 @@
p1.add(identifierExpression);
add(p1);
add(p);
- add(confirmExit);
+
+ Box p2 = new Box(BoxLayout.X_AXIS);
+ p2.add(confirmExit);
+ p2.add(Box.createHorizontalGlue());
+
+ Box p3 = new Box(BoxLayout.X_AXIS);
+ p3.add(showSplash);
+ p3.add(Box.createHorizontalGlue());
+
+ add(p2);
+ add(p3);
add(Box.createVerticalGlue());
}
@@ -440,6 +451,14 @@
((Boolean) evt.getNewValue()).booleanValue());
}
});
+
+ uncommittedPreferenceModel.addPropertyChangeListener("showSplash", new
PropertyChangeListener() {
+
+ public void propertyChange(PropertyChangeEvent evt) {
+ boolean value = ((Boolean)evt.getNewValue()).booleanValue();
+ showSplash.setSelected(value);
+ }});
+
uncommittedPreferenceModel.addPropertyChangeListener(
"identifierExpression",
new PropertyChangeListener() {
@@ -474,6 +493,12 @@
}
});
+ showSplash.addActionListener(new ActionListener() {
+
+ public void actionPerformed(ActionEvent e) {
+ uncommittedPreferenceModel.setShowSplash(showSplash.isSelected());
+ }});
+
responsiveSlider.getModel().addChangeListener(
new ChangeListener() {
public void stateChanged(ChangeEvent e) {
1.12 +1 -0
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- default.properties 20 Dec 2003 05:27:16 -0000 1.11
+++ default.properties 23 Dec 2003 02:18:40 -0000 1.12
@@ -20,6 +20,7 @@
DateFormat.1=HH:mm:ss
DateFormat.2=HH:mm
showNoReceiverWarning=true
+showSplash=true
identifierExpression=PROP.hostname - PROP.application
lookAndFeelClassName=
confirmExit=true
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
