psmith 2003/12/19 20:59:54
Modified: src/java/org/apache/log4j/chainsaw LogUI.java
Log:
extracted some setup code for the Welcome & Receiver panel
into their own methods as a tidy up.
Revision Changes Path
1.61 +64 -17 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.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- LogUI.java 20 Dec 2003 00:22:06 -0000 1.60
+++ LogUI.java 20 Dec 2003 04:59:53 -0000 1.61
@@ -83,7 +83,9 @@
import javax.swing.AbstractAction;
import javax.swing.Action;
import javax.swing.BorderFactory;
+import javax.swing.Box;
import javax.swing.ImageIcon;
+import javax.swing.JButton;
import javax.swing.JComponent;
import javax.swing.JDialog;
import javax.swing.JEditorPane;
@@ -330,23 +332,10 @@
*
*/
private void initGUI() {
- welcomePanel = new WelcomePanel(this);
+ setupHelpSystem();
- /**
- * Setup a listener on the HelpURL property and automatically change the
WelcomePages URL
- * to it.
- */
- HelpManager.getInstance().addPropertyChangeListener("helpURL", new
PropertyChangeListener(){
-
- public void propertyChange(PropertyChangeEvent evt) {
- URL newURL = (URL) evt.getNewValue();
- if(newURL != null) {
- welcomePanel.setURL(newURL);
- }
-
- }});
+ setupReceiverPanel();
- receiversPanel = new ReceiversPanel(this);
setToolBarAndMenus(new ChainsawToolBarAndMenus(this));
toolbar = getToolBarAndMenus().getToolbar();
setJMenuBar(getToolBarAndMenus().getMenubar());
@@ -361,6 +350,64 @@
}
+ private void setupReceiverPanel() {
+ receiversPanel = new ReceiversPanel();
+ receiversPanel.addPropertyChangeListener("visible", new
PropertyChangeListener() {
+
+ public void propertyChange(PropertyChangeEvent evt) {
+ messageLogger.debug("Receiver's panel:" + evt.getNewValue());
+
getApplicationPreferenceModel().setReceivers(((Boolean)evt.getNewValue()).booleanValue());
+ }});
+ }
+
+ /**
+ * Initialises the Help system and the WelcomePanel
+ *
+ */
+ private void setupHelpSystem() {
+ welcomePanel = new WelcomePanel();
+ JToolBar tb = welcomePanel.getToolbar();
+ tb.add(
+ new SmallButton(
+ new AbstractAction("Tutorial", new ImageIcon(ChainsawIcons.HELP)) {
+ public void actionPerformed(ActionEvent e) {
+ setupTutorial();
+ }
+ }));
+ tb.addSeparator();
+
+ final Action exampleConfigAction =
+ new AbstractAction("View example Receiver configuration") {
+ public void actionPerformed(ActionEvent e) {
+ HelpManager.getInstance().setHelpURL(ChainsawConstants.EXAMLE_CONFIG_URL);
+ }
+ };
+
+ exampleConfigAction.putValue(
+ Action.SHORT_DESCRIPTION,
+ "Displays an example Log4j configuration file with several Receivers
defined.");
+
+ JButton exampleButton = new SmallButton(exampleConfigAction);
+ tb.add(exampleButton);
+
+ tb.add(Box.createHorizontalGlue());
+
+
+ /**
+ * Setup a listener on the HelpURL property and automatically change the
WelcomePages URL
+ * to it.
+ */
+ HelpManager.getInstance().addPropertyChangeListener("helpURL", new
PropertyChangeListener(){
+
+ public void propertyChange(PropertyChangeEvent evt) {
+ URL newURL = (URL) evt.getNewValue();
+ if(newURL != null) {
+ welcomePanel.setURL(newURL);
+ }
+
+ }});
+ }
+
/**
* Given the load event, configures the size/location of the main window etc
* etc.
@@ -719,7 +766,7 @@
((ImageIcon) ChainsawIcons.ICON_PREFERENCES).getImage());
preferencesFrame.getContentPane().add(applicationPreferenceModelPanel);
- preferencesFrame.setSize(640, 340);
+ preferencesFrame.setSize(640, 480);
Dimension screenDimension = Toolkit.getDefaultToolkit().getScreenSize();
preferencesFrame.setLocation(new
Point((screenDimension.width/2)-(preferencesFrame.getSize().width/2),
(screenDimension.height/2)-(preferencesFrame.getSize().height/2) ));
@@ -848,7 +895,7 @@
container.setLayout(new BorderLayout());
try {
- tutorialArea.setPage(getWelcomePanel().getTutorialURL());
+ tutorialArea.setPage(ChainsawConstants.TUTORIAL_URL);
container.add(new JScrollPane(tutorialArea), BorderLayout.CENTER);
} catch (Exception e) {
messageLogger.error("Error occurred loading the Tutorial", e);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
