You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2017/05/30 23:48:55 UTC
[18/50] [abbrv] logging-chainsaw git commit: Removed 'use auto-saved
config' from initial receiver config screen,
added 'save' button to receiver definition panel Updates to use of receiver
configuration (using custom-saved option if available)
Removed 'use auto-saved config' from initial receiver config screen, added 'save' button to receiver definition panel
Updates to use of receiver configuration (using custom-saved option if available)
Project: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/commit/e6f85a21
Tree: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/tree/e6f85a21
Diff: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/diff/e6f85a21
Branch: refs/heads/master
Commit: e6f85a2194b87df1681a6f812f2382b8c2a39d52
Parents: 4caf282
Author: Scott Deboy <sd...@apache.org>
Authored: Fri Nov 5 06:19:59 2010 +0000
Committer: Scott Deboy <sd...@apache.org>
Committed: Fri Nov 5 06:19:59 2010 +0000
----------------------------------------------------------------------
.../java/org/apache/log4j/chainsaw/LogUI.java | 27 ++++++++--------
.../chainsaw/ReceiverConfigurationPanel.java | 17 +---------
.../chainsaw/receivers/ReceiversPanel.java | 34 ++++++++++++++++++++
3 files changed, 49 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/e6f85a21/src/main/java/org/apache/log4j/chainsaw/LogUI.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/LogUI.java b/src/main/java/org/apache/log4j/chainsaw/LogUI.java
index dd9775a..da000ca 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogUI.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LogUI.java
@@ -1453,23 +1453,14 @@ public class LogUI extends JFrame implements ChainsawViewer, SettingsListener {
pluginRegistry.addPlugin(networkReceiver);
networkReceiver.activateOptions();
receiversPanel.updateReceiverTreeInDispatchThread();
- //setting config URL here ensures we have the receiver panel auto-saved config loaded
- if (receiverConfigurationPanel.isDontWarnMeAgain()) {
- configURL = receiverConfigurationPanel.getModel().getSavedConfigToLoad();
- }
} catch (Exception e3) {
MessageCenter.getInstance().getLogger().error(
"Error creating Receiver", e3);
MessageCenter.getInstance().getLogger().info(
"An error occurred creating your Receiver");
}
- } else if (receiverConfigurationPanel.getModel().isLoadConfig() ||
- receiverConfigurationPanel.getModel().isLoadSavedConfigs()) {
- if (receiverConfigurationPanel.getModel().isLoadSavedConfigs()) {
- configURL = receiverConfigurationPanel.getModel().getSavedConfigToLoad();
- } else {
+ } else if (receiverConfigurationPanel.getModel().isLoadConfig()) {
configURL = receiverConfigurationPanel.getModel().getConfigToLoad();
- }
} else if (receiverConfigurationPanel.getModel().isLogFileReceiverConfig()) {
try {
URL fileURL = receiverConfigurationPanel.getModel().getLogFileURL();
@@ -1492,9 +1483,6 @@ public class LogUI extends JFrame implements ChainsawViewer, SettingsListener {
pluginRegistry.addPlugin(fileReceiver);
fileReceiver.activateOptions();
receiversPanel.updateReceiverTreeInDispatchThread();
- if (receiverConfigurationPanel.isDontWarnMeAgain()) {
- configURL = receiverConfigurationPanel.getModel().getSavedConfigToLoad();
- }
}
} catch (Exception e2) {
MessageCenter.getInstance().getLogger().error(
@@ -1503,6 +1491,19 @@ public class LogUI extends JFrame implements ChainsawViewer, SettingsListener {
"An error occurred creating your Receiver");
}
}
+ if (configURL == null && receiverConfigurationPanel.isDontWarnMeAgain()) {
+ //use the saved config file as the config URL if defined
+ if (receiverConfigurationPanel.getModel().getSaveConfigFile() != null) {
+ try {
+ configURL = receiverConfigurationPanel.getModel().getSaveConfigFile().toURI().toURL();
+ } catch (MalformedURLException e1) {
+ e1.printStackTrace();
+ }
+ } else {
+ //no saved config defined but don't warn me is checked - use default config
+ configURL = receiverConfigurationPanel.getModel().getDefaultConfigFileURL();
+ }
+ }
if (configURL != null) {
MessageCenter.getInstance().getLogger().debug(
"Initialiazing Log4j with " + configURL.toExternalForm());
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/e6f85a21/src/main/java/org/apache/log4j/chainsaw/ReceiverConfigurationPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/ReceiverConfigurationPanel.java b/src/main/java/org/apache/log4j/chainsaw/ReceiverConfigurationPanel.java
index adbe826..1f94570 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ReceiverConfigurationPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ReceiverConfigurationPanel.java
@@ -100,7 +100,6 @@ class ReceiverConfigurationPanel extends JPanel {
private JRadioButton logFileReceiverRadioButton;
private JRadioButton networkReceiverRadioButton;
private JRadioButton useExistingConfigurationRadioButton;
- private JRadioButton useAutoSavedConfigRadioButton;
private ButtonGroup buttonGroup;
private JPanel lowerPanel;
@@ -157,15 +156,6 @@ class ReceiverConfigurationPanel extends JPanel {
c.gridx = 0;
c.gridy = yPos++;
c.fill = GridBagConstraints.HORIZONTAL;
- c.insets = new Insets(0, 0, 0, 0);
- useAutoSavedConfigRadioButton = new JRadioButton(" Use auto-saved configuration from $HOME/.chainsaw/receiver-config.xml ");
- buttonGroup.add(useAutoSavedConfigRadioButton);
- add(useAutoSavedConfigRadioButton, c);
-
- c = new GridBagConstraints();
- c.gridx = 0;
- c.gridy = yPos++;
- c.fill = GridBagConstraints.HORIZONTAL;
c.insets = new Insets(10, 10, 10, 0);
add(lowerPanel, c);
@@ -197,7 +187,6 @@ class ReceiverConfigurationPanel extends JPanel {
logFileReceiverRadioButton.addActionListener(al);
networkReceiverRadioButton.addActionListener(al);
useExistingConfigurationRadioButton.addActionListener(al);
- useAutoSavedConfigRadioButton.addActionListener(al);
buttonGroup.setSelected(logFileReceiverRadioButton.getModel(), true);
updateEnabledState(logFileReceiverRadioButton);
@@ -690,10 +679,6 @@ class ReceiverConfigurationPanel extends JPanel {
return !cancelled && useExistingConfigurationRadioButton.isSelected();
}
- boolean isLoadSavedConfigs() {
- return !cancelled && useAutoSavedConfigRadioButton.isSelected();
- }
-
boolean isLogFileReceiverConfig() {
return !cancelled && logFileReceiverRadioButton.isSelected();
}
@@ -710,7 +695,7 @@ class ReceiverConfigurationPanel extends JPanel {
}
}
- URL getSavedConfigToLoad() {
+ URL getDefaultConfigFileURL() {
try {
return file.toURI().toURL();
} catch (MalformedURLException e) {
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/e6f85a21/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java b/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java
index 91ba7ca..dfc003b 100644
--- a/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java
@@ -97,6 +97,7 @@ public class ReceiversPanel extends JPanel implements SettingsListener {
final Action pauseReceiverButtonAction;
final Action playReceiverButtonAction;
final Action shutdownReceiverButtonAction;
+ final Action saveReceiversButtonAction;
final Action restartReceiverButtonAction;
private final Action showReceiverHelpAction;
private final Action startAllAction;
@@ -279,6 +280,25 @@ public class ReceiversPanel extends JPanel implements SettingsListener {
Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_S));
shutdownReceiverButtonAction.setEnabled(false);
+
+ saveReceiversButtonAction =
+ new AbstractAction() {
+ public void actionPerformed(ActionEvent e) {
+ saveReceivers();
+ }
+ };
+
+ saveReceiversButtonAction.putValue(
+ Action.SHORT_DESCRIPTION,
+ "Save the current receiver configuration");
+ saveReceiversButtonAction.putValue(Action.NAME, "Save receivers");
+
+ saveReceiversButtonAction.putValue(
+ Action.SMALL_ICON, new ImageIcon(ChainsawIcons.FILE_SAVE_AS));
+ saveReceiversButtonAction.putValue(
+ Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_V));
+
+
restartReceiverButtonAction =
new AbstractAction() {
public void actionPerformed(ActionEvent e) {
@@ -410,6 +430,13 @@ public class ReceiversPanel extends JPanel implements SettingsListener {
}
}
+ private void saveReceivers() {
+ File saveConfigFile = SwingHelper.promptForFile(this, null, "Save receiver configuration XML file", false);
+ if (saveConfigFile != null) {
+ ReceiversHelper.getInstance().saveReceiverConfiguration(saveConfigFile);
+ }
+ }
+
protected ReceiversTreeModel getReceiverTreeModel() {
return ((ReceiversTreeModel) receiversTree.getModel());
}
@@ -774,6 +801,8 @@ public class ReceiversPanel extends JPanel implements SettingsListener {
add(pauseReceiverButtonAction);
add(restartReceiverButtonAction);
add(shutdownReceiverButtonAction);
+ add(saveReceiversButtonAction);
+
addSeparator();
final Receiver r = getCurrentlySelectedReceiver();
@@ -846,6 +875,10 @@ public class ReceiversPanel extends JPanel implements SettingsListener {
new SmallButton(shutdownReceiverButtonAction);
shutdownReceiverButton.setText(null);
+ SmallButton saveReceiversButton =
+ new SmallButton(saveReceiversButtonAction);
+ saveReceiversButton.setText(null);
+
SmallButton restartAllButton = new SmallButton(startAllAction);
restartAllButton.setText(null);
@@ -862,6 +895,7 @@ public class ReceiversPanel extends JPanel implements SettingsListener {
add(restartReceiverButton);
add(shutdownReceiverButton);
+ add(saveReceiversButton);
addSeparator();